Skip to content

Commit

Permalink
fix distinct and cursor code
Browse files Browse the repository at this point in the history
  • Loading branch information
Ajay Kannan committed Oct 13, 2015
1 parent c029c37 commit 0cb15cd
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 110 deletions.
15 changes: 6 additions & 9 deletions gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GqlQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static com.google.gcloud.datastore.Validator.validateNamespace;

import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedMap;
Expand Down Expand Up @@ -137,10 +138,8 @@ static Binding fromPb(com.google.datastore.v1beta3.GqlQueryParameter argPb) {
switch (argPb.getParameterTypeCase()) {
case CURSOR:
return new Binding(new Cursor(argPb.getCursor()));
case VALUE:
return new Binding(Value.fromPb(argPb.getValue()));
default:
return null;
return new Binding(Value.fromPb(argPb.getValue()));
}
}
}
Expand Down Expand Up @@ -398,16 +397,14 @@ private static <V> GqlQuery<V> fromPb(
for (Map.Entry<String, com.google.datastore.v1beta3.GqlQueryParameter> nameArg
: queryPb.getNamedBindings().entrySet()) {
Binding currBinding = Binding.fromPb(nameArg.getValue());
if (currBinding != null) {
builder.namedBindings.put(nameArg.getKey(), currBinding);
}
Preconditions.checkState(currBinding != null);
builder.namedBindings.put(nameArg.getKey(), currBinding);
}
for (com.google.datastore.v1beta3.GqlQueryParameter numberArg
: queryPb.getPositionalBindingsList()) {
Binding currBinding = Binding.fromPb(numberArg);
if (currBinding != null) {
builder.positionalBindings.add(currBinding);
}
Preconditions.checkState(currBinding != null);
builder.positionalBindings.add(currBinding);
}
return builder.build();
}
Expand Down
2 changes: 1 addition & 1 deletion gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public abstract static class ResultType<V> implements java.io.Serializable {
private static final long serialVersionUID = 1602329532153860907L;

@Override protected Object convert(com.google.datastore.v1beta3.Entity entityPb) {
if (entityPb.getProperties().size() == 0) {
if (entityPb.getProperties().isEmpty()) {
if (!entityPb.hasKey()) {
return null;
}
Expand Down
4 changes: 4 additions & 0 deletions gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/QueryResultsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ private void sendRequest() {
entityResultPbIter = queryResultBatchPb.getEntityResultsList().iterator();
if (queryResultBatchPb.getSkippedResults() > 0) {
cursor = queryResultBatchPb.getSkippedCursor();
} else if (entityResultPbIter.hasNext()) {
cursor = queryResultBatchPb.getEntityResults(0).getCursor();
} else {
cursor = queryResultBatchPb.getEndCursor();
}
actualResultType = ResultType.fromPb(queryResultBatchPb.getEntityResultType());
if (Objects.equals(queryResultType, ResultType.PROJECTION_ENTITY)) {
Expand Down
150 changes: 57 additions & 93 deletions gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
* .kind(kind)
* .projection(Projection.property("age"), Projection.first("name"))
* .filter(PropertyFilter.gt("age", 18))
* .groupBy("age")
* .distinct("age")
* .orderBy(OrderBy.asc("age"))
* .limit(10)
* .build();
Expand All @@ -86,9 +86,9 @@ public class StructuredQuery<V> extends Query<V> {
private static final String KEY_PROPERTY_NAME = "__key__";

private final transient String kind;
private final ImmutableList<Projection> projection;
private final ImmutableList<String> projection;
private final transient Filter filter;
private final ImmutableList<String> groupBy;
private final ImmutableList<String> distinctOn;
private final transient ImmutableList<OrderBy> orderBy;
private final transient Cursor startCursor;
private final transient Cursor endCursor;
Expand All @@ -108,10 +108,8 @@ static Filter fromPb(com.google.datastore.v1beta3.Filter filterPb) {
switch (filterPb.getFilterTypeCase()) {
case COMPOSITE_FILTER:
return CompositeFilter.fromPb(filterPb.getCompositeFilter());
case PROPERTY_FILTER:
return PropertyFilter.fromPb(filterPb.getPropertyFilter());
default:
return null;
return PropertyFilter.fromPb(filterPb.getPropertyFilter());
}
}
}
Expand Down Expand Up @@ -525,65 +523,15 @@ static OrderBy fromPb(com.google.datastore.v1beta3.PropertyOrder propertyOrderPb
}
}

public static final class Projection implements Serializable {

private static final long serialVersionUID = 3083707957256279470L;

private final String property;

private Projection(String property) {
this.property = property;
}

@Override
public int hashCode() {
return Objects.hash(property);
}

@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
}
if (!(obj instanceof Projection)) {
return false;
}
return Objects.equals(property, ((Projection) obj).property);
}

@Override
public String toString() {
ToStringHelper toStringHelper = MoreObjects.toStringHelper(this);
toStringHelper.add("property", property);
return toStringHelper.toString();
}

com.google.datastore.v1beta3.Projection toPb() {
com.google.datastore.v1beta3.Projection.Builder expressionPb =
com.google.datastore.v1beta3.Projection.newBuilder();
expressionPb.setProperty(
com.google.datastore.v1beta3.PropertyReference.newBuilder().setName(property).build());
return expressionPb.build();
}

public static Projection fromPb(
com.google.datastore.v1beta3.Projection projectionPb) {
return new Projection(projectionPb.getProperty().getName());
}

public static Projection property(String property) {
return new Projection(property);
}
}

static class BaseBuilder<V, B extends BaseBuilder<V, B>> {

private final ResultType<V> resultType;
private String namespace;
private String kind;
private final List<Projection> projection = new LinkedList<>();
private final List<String> projection = new LinkedList<>();
private Filter filter;
private final List<String> groupBy = new LinkedList<>();
private boolean distinctOnAll = false;
private final List<String> distinctOn = new LinkedList<>();
private final List<OrderBy> orderBy = new LinkedList<>();
private Cursor startCursor;
private Cursor endCursor;
Expand Down Expand Up @@ -658,32 +606,39 @@ B clearProjection() {
return self();
}

B projection(Projection projection, Projection... others) {
B projection(String projection, String... others) {
clearProjection();
addProjection(projection, others);
return self();
}

B addProjection(Projection projection, Projection... others) {
B addProjection(String projection, String... others) {
this.projection.add(projection);
Collections.addAll(this.projection, others);
return self();
}

B clearGroupBy() {
groupBy.clear();
B clearDistinct() {
distinctOn.clear();
distinctOnAll = false;
return self();
}

B groupBy(String property, String... others) {
clearGroupBy();
addGroupBy(property, others);
B distinct(String... properties) {
clearDistinct();
if (properties.length == 0) {
this.distinctOnAll = true;
} else if (properties.length == 1) {
addDistinct(properties[0]);
} else {
addDistinct(properties[0], Arrays.copyOfRange(properties, 1, properties.length));
}
return self();
}

B addGroupBy(String property, String... others) {
this.groupBy.add(property);
Collections.addAll(this.groupBy, others);
B addDistinct(String property, String... others) {
this.distinctOn.add(property);
Collections.addAll(this.distinctOn, others);
return self();
}

Expand Down Expand Up @@ -712,15 +667,20 @@ B mergeFrom(com.google.datastore.v1beta3.Query queryPb) {
}
for (com.google.datastore.v1beta3.Projection projectionPb
: queryPb.getProjectionList()) {
addProjection(Projection.fromPb(projectionPb));
addProjection(projectionPb.getProperty().getName());
}
for (com.google.datastore.v1beta3.PropertyReference groupByPb : queryPb.getDistinctOnList()) {
addGroupBy(groupByPb.getName());
for (com.google.datastore.v1beta3.PropertyReference distinctOnPb : queryPb.getDistinctOnList()) {
addDistinct(distinctOnPb.getName());
}
distinctOnAll = false;
return self();
}

public StructuredQuery<V> build() {
if (distinctOnAll) {
clearDistinct();
this.distinctOn.addAll(this.projection);
}
return new StructuredQuery<>(this);
}
}
Expand Down Expand Up @@ -748,14 +708,14 @@ public static final class KeyQueryBuilder extends BaseBuilder<Key, KeyQueryBuild

KeyQueryBuilder() {
super(ResultType.KEY);
projection(Projection.property(KEY_PROPERTY_NAME));
projection(KEY_PROPERTY_NAME);
}

@Override
protected KeyQueryBuilder mergeFrom(com.google.datastore.v1beta3.Query queryPb) {
super.mergeFrom(queryPb);
projection(Projection.property(KEY_PROPERTY_NAME));
clearGroupBy();
projection(KEY_PROPERTY_NAME);
clearDistinct();
return this;
}

Expand Down Expand Up @@ -783,28 +743,28 @@ public ProjectionEntityQueryBuilder clearProjection() {
}

@Override
public ProjectionEntityQueryBuilder projection(Projection projection, Projection... others) {
public ProjectionEntityQueryBuilder projection(String projection, String... others) {
return super.projection(projection, others);
}

@Override
public ProjectionEntityQueryBuilder addProjection(Projection projection, Projection... others) {
public ProjectionEntityQueryBuilder addProjection(String projection, String... others) {
return super.addProjection(projection, others);
}

@Override
public ProjectionEntityQueryBuilder clearGroupBy() {
return super.clearGroupBy();
public ProjectionEntityQueryBuilder clearDistinct() {
return super.clearDistinct();
}

@Override
public ProjectionEntityQueryBuilder groupBy(String property, String... others) {
return super.groupBy(property, others);
public ProjectionEntityQueryBuilder distinct(String... properties) {
return super.distinct(properties);
}

@Override
public ProjectionEntityQueryBuilder addGroupBy(String property, String... others) {
return super.addGroupBy(property, others);
public ProjectionEntityQueryBuilder addDistinct(String property, String... others) {
return super.addDistinct(property, others);
}
}

Expand All @@ -813,7 +773,7 @@ public ProjectionEntityQueryBuilder addGroupBy(String property, String... others
kind = builder.kind;
projection = ImmutableList.copyOf(builder.projection);
filter = builder.filter;
groupBy = ImmutableList.copyOf(builder.groupBy);
distinctOn = ImmutableList.copyOf(builder.distinctOn);
orderBy = ImmutableList.copyOf(builder.orderBy);
startCursor = builder.startCursor;
endCursor = builder.endCursor;
Expand All @@ -824,7 +784,7 @@ public ProjectionEntityQueryBuilder addGroupBy(String property, String... others
@Override
public int hashCode() {
return Objects.hash(namespace(), kind, startCursor, endCursor, offset, limit, filter, orderBy,
projection(), groupBy());
groupBy());
}

@Override
Expand All @@ -845,7 +805,7 @@ public boolean equals(Object obj) {
&& Objects.equals(filter, other.filter)
&& Objects.equals(orderBy, other.orderBy)
&& Objects.equals(projection, other.projection)
&& Objects.equals(groupBy, other.groupBy);
&& Objects.equals(distinctOn, other.distinctOn);

}

Expand All @@ -854,19 +814,19 @@ public String kind() {
}

boolean keyOnly() {
return projection.size() == 1 && KEY_PROPERTY_NAME.equals(projection.get(0).property);
return projection.size() == 1 && KEY_PROPERTY_NAME.equals(projection.get(0));
}

public List<Projection> projection() {
public List<String> projection() {
return projection;
}

public Filter filter() {
return filter;
}

public List<String> groupBy() {
return groupBy;
public List<String> distinct() {
return distinctOn;
}

public ImmutableList<OrderBy> orderBy() {
Expand Down Expand Up @@ -935,12 +895,16 @@ protected com.google.datastore.v1beta3.Query toPb() {
for (OrderBy value : orderBy) {
queryPb.addOrder(value.toPb());
}
for (String value : groupBy) {
for (String value : distinctOn) {
queryPb.addDistinctOn(com.google.datastore.v1beta3.PropertyReference.newBuilder()
.setName(value).build());
}
for (Projection value : projection) {
queryPb.addProjection(value.toPb());
for (String value : projection) {
com.google.datastore.v1beta3.Projection.Builder expressionPb =
com.google.datastore.v1beta3.Projection.newBuilder();
expressionPb.setProperty(
com.google.datastore.v1beta3.PropertyReference.newBuilder().setName(value).build());
queryPb.addProjection(expressionPb.build());
}
return queryPb.build();
}
Expand Down
7 changes: 3 additions & 4 deletions gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.google.gcloud.RetryParams;
import com.google.gcloud.datastore.Query.ResultType;
import com.google.gcloud.datastore.StructuredQuery.OrderBy;
import com.google.gcloud.datastore.StructuredQuery.Projection;
import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
import com.google.gcloud.spi.DatastoreRpc;
import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
Expand Down Expand Up @@ -421,7 +420,7 @@ public void testRunStructuredQuery() {

StructuredQuery<ProjectionEntity> keyOnlyProjectionQuery =
Query.projectionEntityQueryBuilder()
.kind(KIND1).projection(Projection.property("__key__")).build();
.kind(KIND1).projection("__key__").build();
QueryResults<ProjectionEntity> results3 = datastore.run(keyOnlyProjectionQuery);
assertTrue(results3.hasNext());
ProjectionEntity projectionEntity = results3.next();
Expand All @@ -431,9 +430,9 @@ public void testRunStructuredQuery() {

StructuredQuery<ProjectionEntity> projectionQuery = Query.projectionEntityQueryBuilder()
.kind(KIND2)
.projection(Projection.property("age"))
.projection("age")
.filter(PropertyFilter.gt("age", 18))
.groupBy("age")
.distinct("age")
.orderBy(OrderBy.asc("age"))
.limit(10)
.build();
Expand Down
Loading

0 comments on commit 0cb15cd

Please sign in to comment.