Skip to content

Commit

Permalink
Redesign RpcDataSourceConnector pinning RPC requests (#18692)
Browse files Browse the repository at this point in the history 
This patch removes DataProviderKeyMapper which was mostly dead code
already. Uses a regular KeyMapper instead.

Change-Id: Ic97d1dc827d45fde65bcddc0414bfe711032620c
  • Loading branch information
Teemu Suo-Anttila committed Sep 2, 2015
1 parent 67a1ecf commit ac66a3d
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 390 deletions.
75 changes: 49 additions & 26 deletions client/src/com/vaadin/client/connectors/MultiSelectionModelConnector.java
View file
Expand Up @@ -156,19 +156,16 @@ protected ComplexRenderer<Boolean> createSelectionColumnRenderer(
public void selectAll() {
assert !isBeingBatchSelected() : "Can't select all in middle of a batch selection.";

Set<RowHandle<JsonObject>> rows = new HashSet<DataSource.RowHandle<JsonObject>>();
DataSource<JsonObject> dataSource = getGrid().getDataSource();
for (int i = availableRows.getStart(); i < availableRows.getEnd(); ++i) {
final JsonObject row = dataSource.getRow(i);
if (row != null) {
RowHandle<JsonObject> handle = dataSource.getHandle(row);
markAsSelected(handle, true);
rows.add(handle);
}
}

getRpcProxy(MultiSelectionModelServerRpc.class).selectAll();
cleanRowCache(rows);
}

@Override
Expand Down Expand Up @@ -205,19 +202,16 @@ public boolean deselect(JsonObject... rows) {
public boolean deselectAll() {
assert !isBeingBatchSelected() : "Can't select all in middle of a batch selection.";

Set<RowHandle<JsonObject>> rows = new HashSet<DataSource.RowHandle<JsonObject>>();
DataSource<JsonObject> dataSource = getGrid().getDataSource();
for (int i = availableRows.getStart(); i < availableRows.getEnd(); ++i) {
final JsonObject row = dataSource.getRow(i);
if (row != null) {
RowHandle<JsonObject> handle = dataSource.getHandle(row);
markAsSelected(handle, false);
rows.add(handle);
}
}

getRpcProxy(MultiSelectionModelServerRpc.class).deselectAll();
cleanRowCache(rows);

return true;
}
Expand All @@ -235,8 +229,9 @@ public boolean select(Collection<JsonObject> rows) {

for (JsonObject row : rows) {
RowHandle<JsonObject> rowHandle = getRowHandle(row);
markAsSelected(rowHandle, true);
selected.add(rowHandle);
if (markAsSelected(rowHandle, true)) {
selected.add(rowHandle);
}
}

if (!isBeingBatchSelected()) {
Expand All @@ -246,23 +241,35 @@ public boolean select(Collection<JsonObject> rows) {
}

/**
* Marks the JsonObject pointed by RowHandle to have selected
* information equal to given boolean
* Marks the given row to be selected or deselected. Returns true if the
* value actually changed.
* <p>
* Note: If selection model is in batch select state, the row will be
* pinned on select.
*
* @param row
* row handle
* @param selected
* should row be selected
* {@code true} if row should be selected; {@code false} if
* not
* @return {@code true} if selected status changed; {@code false} if not
*/
protected void markAsSelected(RowHandle<JsonObject> row,
protected boolean markAsSelected(RowHandle<JsonObject> row,
boolean selected) {
row.pin();
if (selected) {
if (selected && !isSelected(row.getRow())) {
row.getRow().put(GridState.JSONKEY_SELECTED, true);
} else {
} else if (!selected && isSelected(row.getRow())) {
row.getRow().remove(GridState.JSONKEY_SELECTED);
} else {
return false;
}

row.updateRow();

if (isBeingBatchSelected()) {
row.pin();
}
return true;
}

/**
Expand All @@ -278,8 +285,9 @@ public boolean deselect(Collection<JsonObject> rows) {

for (JsonObject row : rows) {
RowHandle<JsonObject> rowHandle = getRowHandle(row);
markAsSelected(rowHandle, false);
deselected.add(rowHandle);
if (markAsSelected(rowHandle, false)) {
deselected.add(rowHandle);
}
}

if (!isBeingBatchSelected()) {
Expand All @@ -288,16 +296,38 @@ public boolean deselect(Collection<JsonObject> rows) {
return true;
}

/**
* Sends a deselect RPC call to server-side containing all deselected
* rows. Unpins any pinned rows.
*/
private void sendDeselected() {
getRpcProxy(MultiSelectionModelServerRpc.class).deselect(
getRowKeys(deselected));
cleanRowCache(deselected);

if (isBeingBatchSelected()) {
for (RowHandle<JsonObject> row : deselected) {
row.unpin();
}
}

deselected.clear();
}

/**
* Sends a select RPC call to server-side containing all selected rows.
* Unpins any pinned rows.
*/
private void sendSelected() {
getRpcProxy(MultiSelectionModelServerRpc.class).select(
getRowKeys(selected));
cleanRowCache(selected);

if (isBeingBatchSelected()) {
for (RowHandle<JsonObject> row : selected) {
row.unpin();
}
}

selected.clear();
}

private List<String> getRowKeys(Set<RowHandle<JsonObject>> handles) {
Expand All @@ -316,13 +346,6 @@ private Set<JsonObject> getRows(Set<RowHandle<JsonObject>> handles) {
return rows;
}

private void cleanRowCache(Set<RowHandle<JsonObject>> handles) {
for (RowHandle<JsonObject> handle : handles) {
handle.unpin();
}
handles.clear();
}

@Override
public void startBatchSelect() {
assert selected.isEmpty() && deselected.isEmpty() : "Row caches were not clear.";
Expand Down
20 changes: 7 additions & 13 deletions client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java
View file
Expand Up @@ -189,24 +189,16 @@ public RowHandle<JsonObject> getHandleByKey(Object key) {
return new RowHandleImpl(row, key);
}

@Override
protected void pinHandle(RowHandleImpl handle) {
// Server only knows if something is pinned or not. No need to pin
// multiple times.
boolean pinnedBefore = handle.isPinned();
super.pinHandle(handle);
if (!pinnedBefore) {
rpcProxy.setPinned(getRowKey(handle.getRow()), true);
}
}

@Override
protected void unpinHandle(RowHandleImpl handle) {
// Row data is no longer available after it has been unpinned.
String key = getRowKey(handle.getRow());
super.unpinHandle(handle);
if (!handle.isPinned()) {
rpcProxy.setPinned(key, false);
if (indexOfKey(key) == -1) {
// Row out of view has been unpinned. drop it
droppedRowKeys.set(droppedRowKeys.length(), key);
}
}
}

Expand Down Expand Up @@ -244,7 +236,9 @@ protected void updateRowData(JsonObject row) {

@Override
protected void onDropFromCache(int rowIndex, JsonObject row) {
droppedRowKeys.set(droppedRowKeys.length(), getRowKey(row));
if (!((RowHandleImpl) getHandle(row)).isPinned()) {
droppedRowKeys.set(droppedRowKeys.length(), getRowKey(row));
}
}
}

Expand Down
10 changes: 1 addition & 9 deletions client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
View file
Expand Up @@ -16,8 +16,6 @@

package com.vaadin.client.data;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -120,12 +118,7 @@ assert getRowKey(row).equals(key) : "The old key does not "

@Override
public T getRow() throws IllegalStateException {
if (isPinned()) {
return row;
} else {
throw new IllegalStateException("The row handle for key " + key
+ " was not pinned");
}
return row;
}

public boolean isPinned() {
Expand Down Expand Up @@ -197,7 +190,6 @@ public void execute() {

private Map<Object, Integer> pinnedCounts = new HashMap<Object, Integer>();
private Map<Object, RowHandleImpl> pinnedRows = new HashMap<Object, RowHandleImpl>();
protected Collection<T> temporarilyPinnedRows = Collections.emptySet();

// Size not yet known
private int size = -1;
Expand Down

0 comments on commit ac66a3d

Please sign in to comment.