summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-07-25 12:14:30 +0300
committerVaadin Code Review <review@vaadin.com>2015-11-25 07:55:33 +0000
commit39c7d9f68a3723feeebf3b05646aaef2fe3ce070 (patch)
tree5e29f7242b981b8456a4f70f0da183a374947611 /client
parent48049ced5414a5df1b268f84d8240c91363026c4 (diff)
downloadvaadin-framework-39c7d9f68a3723feeebf3b05646aaef2fe3ce070.tar.gz
vaadin-framework-39c7d9f68a3723feeebf3b05646aaef2fe3ce070.zip
Omit empty hierarchy data from the response (#18510)
Reduces the payload size for the "Update all labels" action with 40 layouts in BasicPerformanceTest by 16% (from 11087 to 9270 bytes). The reduction is improved to 22% (1855 to 1455) if the response is gzipped since the omited data doesn't compress very well. Change-Id: I1d2837c93222fffa59b14836f162e3e87349e086
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/communication/MessageHandler.java289
1 files changed, 166 insertions, 123 deletions
diff --git a/client/src/com/vaadin/client/communication/MessageHandler.java b/client/src/com/vaadin/client/communication/MessageHandler.java
index e87928fc57..7ff8820563 100644
--- a/client/src/com/vaadin/client/communication/MessageHandler.java
+++ b/client/src/com/vaadin/client/communication/MessageHandler.java
@@ -1122,142 +1122,42 @@ public class MessageHandler {
ConnectorHierarchyUpdateResult result = new ConnectorHierarchyUpdateResult();
getLogger().info(" * Updating connector hierarchy");
- if (!json.containsKey("hierarchy")) {
- return result;
- }
Profiler.enter("updateConnectorHierarchy");
FastStringSet maybeDetached = FastStringSet.create();
+ FastStringSet hasHierarchy = FastStringSet.create();
- ValueMap hierarchies = json.getValueMap("hierarchy");
- JsArrayString hierarchyKeys = hierarchies.getKeyArray();
- for (int i = 0; i < hierarchyKeys.length(); i++) {
- try {
- Profiler.enter("updateConnectorHierarchy hierarchy entry");
-
+ // Process regular hierarchy data
+ if (json.containsKey("hierarchy")) {
+ ValueMap hierarchies = json.getValueMap("hierarchy");
+ JsArrayString hierarchyKeys = hierarchies.getKeyArray();
+ for (int i = 0; i < hierarchyKeys.length(); i++) {
String connectorId = hierarchyKeys.get(i);
- ServerConnector parentConnector = getConnectorMap()
- .getConnector(connectorId);
JsArrayString childConnectorIds = hierarchies
.getJSStringArray(connectorId);
- int childConnectorSize = childConnectorIds.length();
-
- Profiler.enter("updateConnectorHierarchy find new connectors");
-
- List<ServerConnector> newChildren = new ArrayList<ServerConnector>();
- List<ComponentConnector> newComponents = new ArrayList<ComponentConnector>();
- for (int connectorIndex = 0; connectorIndex < childConnectorSize; connectorIndex++) {
- String childConnectorId = childConnectorIds
- .get(connectorIndex);
- ServerConnector childConnector = getConnectorMap()
- .getConnector(childConnectorId);
- if (childConnector == null) {
- getLogger()
- .severe("Hierarchy claims that "
- + childConnectorId
- + " is a child for "
- + connectorId
- + " ("
- + parentConnector.getClass()
- .getName()
- + ") but no connector with id "
- + childConnectorId
- + " has been registered. "
- + "More information might be available in the server-side log if assertions are enabled");
- continue;
- }
- newChildren.add(childConnector);
- if (childConnector instanceof ComponentConnector) {
- newComponents
- .add((ComponentConnector) childConnector);
- } else if (!(childConnector instanceof AbstractExtensionConnector)) {
- throw new IllegalStateException(
- Util.getConnectorString(childConnector)
- + " is not a ComponentConnector nor an AbstractExtensionConnector");
- }
- if (childConnector.getParent() != parentConnector) {
- childConnector.setParent(parentConnector);
- result.parentChangedIds.add(childConnectorId);
- // Not detached even if previously removed from
- // parent
- maybeDetached.remove(childConnectorId);
- }
- }
-
- Profiler.leave("updateConnectorHierarchy find new connectors");
-
- // TODO This check should be done on the server side in
- // the future so the hierarchy update is only sent when
- // something actually has changed
- List<ServerConnector> oldChildren = parentConnector
- .getChildren();
- boolean actuallyChanged = !Util.collectionsEquals(
- oldChildren, newChildren);
-
- if (!actuallyChanged) {
- continue;
- }
-
- Profiler.enter("updateConnectorHierarchy handle HasComponentsConnector");
-
- if (parentConnector instanceof HasComponentsConnector) {
- HasComponentsConnector ccc = (HasComponentsConnector) parentConnector;
- List<ComponentConnector> oldComponents = ccc
- .getChildComponents();
- if (!Util.collectionsEquals(oldComponents,
- newComponents)) {
- // Fire change event if the hierarchy has
- // changed
- ConnectorHierarchyChangeEvent event = GWT
- .create(ConnectorHierarchyChangeEvent.class);
- event.setOldChildren(oldComponents);
- event.setConnector(parentConnector);
- ccc.setChildComponents(newComponents);
- result.events.add(event);
- }
- } else if (!newComponents.isEmpty()) {
- getLogger()
- .severe("Hierachy claims "
- + Util.getConnectorString(parentConnector)
- + " has component children even though it isn't a HasComponentsConnector");
- }
+ hasHierarchy.add(connectorId);
- Profiler.leave("updateConnectorHierarchy handle HasComponentsConnector");
-
- Profiler.enter("updateConnectorHierarchy setChildren");
- parentConnector.setChildren(newChildren);
- Profiler.leave("updateConnectorHierarchy setChildren");
+ updateConnectorHierarchy(connectorId,
+ childConnectorIds, maybeDetached, result);
+ }
+ }
- Profiler.enter("updateConnectorHierarchy find removed children");
+ // Assume empty hierarchy for connectors with state updates but
+ // no hierarchy data
+ if (json.containsKey("state")) {
+ JsArrayString stateKeys = json.getValueMap("state")
+ .getKeyArray();
- /*
- * Find children removed from this parent and mark for
- * removal unless they are already attached to some
- * other parent.
- */
- for (ServerConnector oldChild : oldChildren) {
- if (oldChild.getParent() != parentConnector) {
- // Ignore if moved to some other connector
- continue;
- }
+ JsArrayString emptyArray = JavaScriptObject.createArray()
+ .cast();
- if (!newChildren.contains(oldChild)) {
- /*
- * Consider child detached for now, will be
- * cleared if it is later on added to some other
- * parent.
- */
- maybeDetached.add(oldChild.getConnectorId());
- }
+ for (int i = 0; i < stateKeys.length(); i++) {
+ String connectorId = stateKeys.get(i);
+ if (!hasHierarchy.contains(connectorId)) {
+ updateConnectorHierarchy(connectorId, emptyArray,
+ maybeDetached, result);
}
-
- Profiler.leave("updateConnectorHierarchy find removed children");
- } catch (final Throwable e) {
- getLogger().log(Level.SEVERE,
- "Error updating connector hierarchy", e);
- } finally {
- Profiler.leave("updateConnectorHierarchy hierarchy entry");
}
}
@@ -1287,6 +1187,149 @@ public class MessageHandler {
}
+ /**
+ * Updates the hierarchy for a connector
+ *
+ * @since
+ * @param connectorId
+ * the id of the connector to update
+ * @param childConnectorIds
+ * array of child connector ids
+ * @param maybeDetached
+ * set of connectors that are maybe detached
+ * @param result
+ * the hierarchy update result
+ */
+ private void updateConnectorHierarchy(String connectorId,
+ JsArrayString childConnectorIds,
+ FastStringSet maybeDetached,
+ ConnectorHierarchyUpdateResult result) {
+ try {
+ Profiler.enter("updateConnectorHierarchy hierarchy entry");
+
+ ConnectorMap connectorMap = getConnectorMap();
+
+ ServerConnector parentConnector = connectorMap
+ .getConnector(connectorId);
+ int childConnectorSize = childConnectorIds.length();
+
+ Profiler.enter("updateConnectorHierarchy find new connectors");
+
+ List<ServerConnector> newChildren = new ArrayList<ServerConnector>();
+ List<ComponentConnector> newComponents = new ArrayList<ComponentConnector>();
+ for (int connectorIndex = 0; connectorIndex < childConnectorSize; connectorIndex++) {
+ String childConnectorId = childConnectorIds
+ .get(connectorIndex);
+ ServerConnector childConnector = connectorMap
+ .getConnector(childConnectorId);
+ if (childConnector == null) {
+ getLogger()
+ .severe("Hierarchy claims that "
+ + childConnectorId
+ + " is a child for "
+ + connectorId
+ + " ("
+ + parentConnector.getClass()
+ .getName()
+ + ") but no connector with id "
+ + childConnectorId
+ + " has been registered. "
+ + "More information might be available in the server-side log if assertions are enabled");
+ continue;
+ }
+ newChildren.add(childConnector);
+ if (childConnector instanceof ComponentConnector) {
+ newComponents
+ .add((ComponentConnector) childConnector);
+ } else if (!(childConnector instanceof AbstractExtensionConnector)) {
+ throw new IllegalStateException(
+ Util.getConnectorString(childConnector)
+ + " is not a ComponentConnector nor an AbstractExtensionConnector");
+ }
+ if (childConnector.getParent() != parentConnector) {
+ childConnector.setParent(parentConnector);
+ result.parentChangedIds.add(childConnectorId);
+ // Not detached even if previously removed from
+ // parent
+ maybeDetached.remove(childConnectorId);
+ }
+ }
+
+ Profiler.leave("updateConnectorHierarchy find new connectors");
+
+ // TODO This check should be done on the server side in
+ // the future so the hierarchy update is only sent when
+ // something actually has changed
+ List<ServerConnector> oldChildren = parentConnector
+ .getChildren();
+ boolean actuallyChanged = !Util.collectionsEquals(
+ oldChildren, newChildren);
+
+ if (!actuallyChanged) {
+ return;
+ }
+
+ Profiler.enter("updateConnectorHierarchy handle HasComponentsConnector");
+
+ if (parentConnector instanceof HasComponentsConnector) {
+ HasComponentsConnector ccc = (HasComponentsConnector) parentConnector;
+ List<ComponentConnector> oldComponents = ccc
+ .getChildComponents();
+ if (!Util.collectionsEquals(oldComponents,
+ newComponents)) {
+ // Fire change event if the hierarchy has
+ // changed
+ ConnectorHierarchyChangeEvent event = GWT
+ .create(ConnectorHierarchyChangeEvent.class);
+ event.setOldChildren(oldComponents);
+ event.setConnector(parentConnector);
+ ccc.setChildComponents(newComponents);
+ result.events.add(event);
+ }
+ } else if (!newComponents.isEmpty()) {
+ getLogger()
+ .severe("Hierachy claims "
+ + Util.getConnectorString(parentConnector)
+ + " has component children even though it isn't a HasComponentsConnector");
+ }
+
+ Profiler.leave("updateConnectorHierarchy handle HasComponentsConnector");
+
+ Profiler.enter("updateConnectorHierarchy setChildren");
+ parentConnector.setChildren(newChildren);
+ Profiler.leave("updateConnectorHierarchy setChildren");
+
+ Profiler.enter("updateConnectorHierarchy find removed children");
+
+ /*
+ * Find children removed from this parent and mark for
+ * removal unless they are already attached to some other
+ * parent.
+ */
+ for (ServerConnector oldChild : oldChildren) {
+ if (oldChild.getParent() != parentConnector) {
+ // Ignore if moved to some other connector
+ continue;
+ }
+
+ if (!newChildren.contains(oldChild)) {
+ /*
+ * Consider child detached for now, will be cleared
+ * if it is later on added to some other parent.
+ */
+ maybeDetached.add(oldChild.getConnectorId());
+ }
+ }
+
+ Profiler.leave("updateConnectorHierarchy find removed children");
+ } catch (final Throwable e) {
+ getLogger().log(Level.SEVERE,
+ "Error updating connector hierarchy", e);
+ } finally {
+ Profiler.leave("updateConnectorHierarchy hierarchy entry");
+ }
+ }
+
private void recursivelyDetach(ServerConnector connector,
JsArrayObject<ConnectorHierarchyChangeEvent> events,
FastStringSet detachedConnectors) {