Skip to content

Commit d916e8c

Browse files
Alexandre Dutraolim7t
Alexandre Dutra
authored and
olim7t
committed
Refactor QueryType.
1 parent 1a510ed commit d916e8c

1 file changed

Lines changed: 63 additions & 149 deletions

File tree

  • driver-mapping/src/main/java/com/datastax/driver/mapping

‎driver-mapping/src/main/java/com/datastax/driver/mapping/QueryType.java‎

Lines changed: 63 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -19,171 +19,85 @@
1919
import com.datastax.driver.core.querybuilder.Delete;
2020
import com.datastax.driver.core.querybuilder.Insert;
2121
import com.datastax.driver.core.querybuilder.Select;
22-
import com.google.common.base.Objects;
2322

24-
import java.util.ArrayList;
2523
import java.util.Collection;
26-
import java.util.List;
2724
import java.util.Set;
2825

2926
import static com.datastax.driver.core.querybuilder.QueryBuilder.*;
3027

31-
class QueryType {
32-
33-
private enum Kind {SAVE, GET, DEL, SLICE, REVERSED_SLICE}
34-
35-
private final Kind kind;
36-
37-
// For slices
38-
private final int startBoundSize;
39-
private final boolean startInclusive;
40-
private final int endBoundSize;
41-
private final boolean endInclusive;
42-
43-
static final QueryType SAVE = new QueryType(Kind.SAVE);
44-
static final QueryType DEL = new QueryType(Kind.DEL);
45-
static final QueryType GET = new QueryType(Kind.GET);
46-
47-
private QueryType(Kind kind) {
48-
this(kind, 0, false, 0, false);
49-
}
50-
51-
private QueryType(Kind kind, int startBoundSize, boolean startInclusive, int endBoundSize, boolean endInclusive) {
52-
this.kind = kind;
53-
this.startBoundSize = startBoundSize;
54-
this.startInclusive = startInclusive;
55-
this.endBoundSize = endBoundSize;
56-
this.endInclusive = endInclusive;
57-
}
28+
enum QueryType {
29+
30+
SAVE {
31+
@Override
32+
String makePreparedQueryString(TableMetadata table, EntityMapper<?> mapper, MappingManager manager, Set<PropertyMapper> columns, Collection<Mapper.Option> options) {
33+
Insert insert = table == null
34+
? insertInto(mapper.getKeyspace(), mapper.getTable())
35+
: insertInto(table);
36+
for (PropertyMapper col : columns)
37+
if (!col.isComputed())
38+
insert.value(col.columnName, bindMarker());
39+
40+
Insert.Options usings = insert.using();
41+
for (Mapper.Option opt : options) {
42+
opt.checkValidFor(QueryType.SAVE, manager);
43+
if (opt.isIncludedInQuery())
44+
opt.appendTo(usings);
45+
}
46+
return insert.toString();
47+
}
5848

59-
String makePreparedQueryString(TableMetadata table, EntityMapper<?> mapper, MappingManager manager, Set<PropertyMapper> columns, Collection<Mapper.Option> options) {
60-
switch (kind) {
61-
case SAVE: {
62-
Insert insert = table == null
63-
? insertInto(mapper.getKeyspace(), mapper.getTable())
64-
: insertInto(table);
65-
for (PropertyMapper col : columns)
66-
if (!col.isComputed())
67-
insert.value(col.columnName, bindMarker());
49+
},
6850

69-
Insert.Options usings = insert.using();
70-
for (Mapper.Option opt : options) {
71-
opt.checkValidFor(QueryType.SAVE, manager);
72-
if (opt.isIncludedInQuery())
73-
opt.appendTo(usings);
74-
}
75-
return insert.toString();
76-
}
77-
case GET: {
78-
Select.Selection selection = select();
79-
for (PropertyMapper col : mapper.allColumns) {
80-
Select.SelectionOrAlias column = col.isComputed()
81-
? selection.raw(col.columnName)
82-
: selection.column(col.columnName);
51+
GET {
52+
@Override
53+
String makePreparedQueryString(TableMetadata table, EntityMapper<?> mapper, MappingManager manager, Set<PropertyMapper> columns, Collection<Mapper.Option> options) {
54+
Select.Selection selection = select();
55+
for (PropertyMapper col : mapper.allColumns) {
56+
Select.SelectionOrAlias column = col.isComputed()
57+
? selection.raw(col.columnName)
58+
: selection.column(col.columnName);
8359

84-
if (col.alias == null) {
85-
selection = column;
86-
} else {
87-
selection = column.as(col.alias);
88-
}
89-
}
90-
Select select;
91-
if (table == null) {
92-
select = selection.from(mapper.getKeyspace(), mapper.getTable());
60+
if (col.alias == null) {
61+
selection = column;
9362
} else {
94-
select = selection.from(table);
63+
selection = column.as(col.alias);
9564
}
96-
Select.Where where = select.where();
97-
for (int i = 0; i < mapper.primaryKeySize(); i++)
98-
where.and(eq(mapper.getPrimaryKeyColumn(i).columnName, bindMarker()));
99-
100-
for (Mapper.Option opt : options)
101-
opt.checkValidFor(QueryType.GET, manager);
102-
return select.toString();
10365
}
104-
case DEL: {
105-
Delete delete = table == null
106-
? delete().all().from(mapper.getKeyspace(), mapper.getTable())
107-
: delete().all().from(table);
108-
Delete.Where where = delete.where();
109-
for (int i = 0; i < mapper.primaryKeySize(); i++)
110-
where.and(eq(mapper.getPrimaryKeyColumn(i).columnName, bindMarker()));
111-
Delete.Options usings = delete.using();
112-
for (Mapper.Option opt : options) {
113-
opt.checkValidFor(QueryType.DEL, manager);
114-
if (opt.isIncludedInQuery())
115-
opt.appendTo(usings);
116-
}
117-
return delete.toString();
66+
Select select;
67+
if (table == null) {
68+
select = selection.from(mapper.getKeyspace(), mapper.getTable());
69+
} else {
70+
select = selection.from(table);
11871
}
119-
case SLICE:
120-
case REVERSED_SLICE: {
121-
Select select = table == null
122-
? select().all().from(mapper.getKeyspace(), mapper.getTable())
123-
: select().all().from(table);
124-
Select.Where where = select.where();
125-
for (int i = 0; i < mapper.partitionKeys.size(); i++)
126-
where.and(eq(mapper.partitionKeys.get(i).columnName, bindMarker()));
127-
128-
if (startBoundSize > 0) {
129-
if (startBoundSize == 1) {
130-
String name = mapper.clusteringColumns.get(0).columnName;
131-
where.and(startInclusive ? gte(name, bindMarker()) : gt(name, bindMarker()));
132-
} else {
133-
List<String> names = new ArrayList<String>(startBoundSize);
134-
List<Object> values = new ArrayList<Object>(startBoundSize);
135-
for (int i = 0; i < startBoundSize; i++) {
136-
names.add(mapper.clusteringColumns.get(i).columnName);
137-
values.add(bindMarker());
138-
}
139-
where.and(startInclusive ? gte(names, values) : gt(names, values));
140-
}
141-
}
72+
Select.Where where = select.where();
73+
for (int i = 0; i < mapper.primaryKeySize(); i++)
74+
where.and(eq(mapper.getPrimaryKeyColumn(i).columnName, bindMarker()));
14275

143-
if (endBoundSize > 0) {
144-
if (endBoundSize == 1) {
145-
String name = mapper.clusteringColumns.get(0).columnName;
146-
where.and(endInclusive ? gte(name, bindMarker()) : gt(name, bindMarker()));
147-
} else {
148-
List<String> names = new ArrayList<String>(endBoundSize);
149-
List<Object> values = new ArrayList<Object>(endBoundSize);
150-
for (int i = 0; i < endBoundSize; i++) {
151-
names.add(mapper.clusteringColumns.get(i).columnName);
152-
values.add(bindMarker());
153-
}
154-
where.and(endInclusive ? lte(names, values) : lt(names, values));
76+
for (Mapper.Option opt : options)
77+
opt.checkValidFor(QueryType.GET, manager);
78+
return select.toString();
79+
}
80+
},
81+
82+
DEL {
83+
@Override
84+
String makePreparedQueryString(TableMetadata table, EntityMapper<?> mapper, MappingManager manager, Set<PropertyMapper> columns, Collection<Mapper.Option> options) {
85+
Delete delete = table == null
86+
? delete().all().from(mapper.getKeyspace(), mapper.getTable())
87+
: delete().all().from(table);
88+
Delete.Where where = delete.where();
89+
for (int i = 0; i < mapper.primaryKeySize(); i++)
90+
where.and(eq(mapper.getPrimaryKeyColumn(i).columnName, bindMarker()));
91+
Delete.Options usings = delete.using();
92+
for (Mapper.Option opt : options) {
93+
opt.checkValidFor(QueryType.DEL, manager);
94+
if (opt.isIncludedInQuery())
95+
opt.appendTo(usings);
15596
}
156-
}
157-
158-
select = select.limit(bindMarker());
159-
160-
if (kind == Kind.REVERSED_SLICE)
161-
select = select.orderBy(desc(mapper.clusteringColumns.get(0).columnName));
162-
163-
return select.toString();
164-
}
97+
return delete.toString();
16598
}
166-
throw new AssertionError();
167-
}
168-
169-
@Override
170-
public boolean equals(Object obj) {
171-
if (this == obj)
172-
return true;
173-
if (obj == null || this.getClass() != obj.getClass())
174-
return false;
175-
176-
QueryType that = (QueryType) obj;
177-
return kind == that.kind
178-
&& startBoundSize == that.startBoundSize
179-
&& startInclusive == that.startInclusive
180-
&& endBoundSize == that.endBoundSize
181-
&& endInclusive == that.endInclusive;
182-
}
99+
};
183100

184-
@Override
185-
public int hashCode() {
186-
return Objects.hashCode(kind, startBoundSize, startInclusive, endBoundSize, endInclusive);
187-
}
101+
abstract String makePreparedQueryString(TableMetadata table, EntityMapper<?> mapper, MappingManager manager, Set<PropertyMapper> columns, Collection<Mapper.Option> options);
188102

189103
}

0 commit comments

Comments
 (0)