Conflict management during data object synchronization between client and server
First Claim
1. A computer implemented method for synchronizing data objects stored on a server and a client, comprising:
- at the server, storing server metadata entries corresponding to a plurality of data objects, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server, the server file name including a directory path;
at the server;
during a first phase of a synchronization process, receiving one or more client metadata entries from the client, each of the client metadata entries corresponding to a data object stored on the client for which at least one metadata parameter has changed since a prior execution of the synchronization process, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client, the client file name including a directory path;
during the first phase of the synchronization process, rejecting any received client metadata entry that contains one or more updated metadata parameters that conflict with metadata parameters of a corresponding server metadata entry, and accepting any received client metadata entry that does not conflict with a corresponding server metadata entry, wherein a server metadata entry corresponds to a received client metadata entry when the received client metadata entry contains a same identifier as the server metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match;
during the first phase of the synchronization process, accepting any received client metadata entry for which the server does not have a corresponding server metadata entry; and
during a second phase of the synchronization process, sending to the client one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server for which at least one metadata parameter has changed since a prior execution of the synchronization process;
wherein, when a client metadata entry has been rejected at the server during the first phase, the one or more server metadata entries sent to the client include at least one server metadata entry that conflicts with the rejected client metadata entry.
1 Assignment
0 Petitions
Accused Products
Abstract
A client stores client metadata entries corresponding to a plurality of data objects. During a first phase of a synchronization process, the client sends one or more client metadata entries to a server. Each client metadata entry sent corresponds to a data object for which at least one metadata parameter has changed since a prior execution of the synchronization process. During a second phase of the synchronization process, the client receives from the server one or more server metadata entries, each having at least one parameter that has changed since a prior execution of the synchronization process. The client identifies any received server metadata entry that conflicts with a corresponding client metadata entry, requests a user to select from among a predefined set of conflict resolutions to resolve the conflict, and the performs an action in accordance with the conflict resolution selected by the user.
-
Citations
48 Claims
-
1. A computer implemented method for synchronizing data objects stored on a server and a client, comprising:
-
at the server, storing server metadata entries corresponding to a plurality of data objects, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server, the server file name including a directory path; at the server; during a first phase of a synchronization process, receiving one or more client metadata entries from the client, each of the client metadata entries corresponding to a data object stored on the client for which at least one metadata parameter has changed since a prior execution of the synchronization process, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client, the client file name including a directory path; during the first phase of the synchronization process, rejecting any received client metadata entry that contains one or more updated metadata parameters that conflict with metadata parameters of a corresponding server metadata entry, and accepting any received client metadata entry that does not conflict with a corresponding server metadata entry, wherein a server metadata entry corresponds to a received client metadata entry when the received client metadata entry contains a same identifier as the server metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match; during the first phase of the synchronization process, accepting any received client metadata entry for which the server does not have a corresponding server metadata entry; and during a second phase of the synchronization process, sending to the client one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server for which at least one metadata parameter has changed since a prior execution of the synchronization process;
wherein, when a client metadata entry has been rejected at the server during the first phase, the one or more server metadata entries sent to the client include at least one server metadata entry that conflicts with the rejected client metadata entry. - View Dependent Claims (2, 3, 4, 5, 6, 7)
-
-
8. A computer implemented method for synchronizing data objects stored on a server and a client, comprising:
-
at the client, storing client metadata entries corresponding to a plurality of data objects, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client, the client file name including a directory path; at the client; during a first phase of a synchronization process, sending one or more client metadata entries to the server, each of the client metadata entries corresponding to a data object stored on the client for which at least one metadata parameter has changed since a prior execution of the synchronization process; during a second phase of the synchronization process, receiving from the server one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server for which at least one metadata parameter has changed in the server metadata entry since a prior execution of the synchronization process, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server, the server file name including a directory path;
wherein, when a client metadata entry has been rejected at the server during the first phase, the one or more server metadata entries sent to the client include at least one server metadata entry that conflicts with rejected client metadata entry;during the second phase of the synchronization process, accepting any received server metadata entry for which the client does not have a corresponding client metadata entry; during the second phase of the synchronization process, identifying any received server metadata entry that contains one or more updated metadata parameters that conflict with metadata parameters of a corresponding client metadata entry, requesting a user to select from among a predefined set of conflict resolutions to resolve the conflict, performing an action in accordance with the conflict resolution selected by the user, and accepting any received server metadata entry that does not conflict with a corresponding server metadata entry, wherein a client metadata entry corresponds to a received server metadata entry when the received server metadata entry contains a same identifier as the client metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match. - View Dependent Claims (9, 10, 11, 12, 13, 14, 15, 16)
-
-
17. A non-transitory computer readable storage medium storing one or more programs for execution by one or more processors of a server system, the one or more programs comprising instructions for:
-
storing, at the server system, server metadata entries corresponding to a plurality of data objects stored on the server system, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server system, the server file name including a directory path; during a first phase of a synchronization process, receiving, at the server system, one or more client metadata entries from a client system, each of the client metadata entries corresponding to a data object stored on the client system for which at least one metadata parameter has changed since a prior execution of the synchronization process, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client system, the client file name including a directory path; during the first phase of the synchronization process, at the server system, rejecting any received client metadata entry that contains one or more updated metadata parameters that conflicts with metadata parameters of a corresponding server metadata entry, and accepting any received client metadata entry that does not conflict with a corresponding server metadata entry, wherein a server metadata entry corresponds to a received client metadata entry when the received client metadata entry contains a same identifier as the server metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match; during the first phase of the synchronization process, accepting any received client metadata entry for which the server system does not have a corresponding server metadata entry; and during a second phase of the synchronization process, at the server system, sending to the client system one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server system for which at least one metadata parameter has changed since a prior execution of the synchronization process;
wherein, when a client metadata entry has been rejected at the server system during the first phase, the one or more server metadata entries sent to the client system include at least one server metadata entry that conflicts with rejected client metadata entry. - View Dependent Claims (21, 22, 23, 24, 25, 26)
-
-
18. A non-transitory computer readable storage medium storing one or more programs for execution by one or more processors of a client system, the one or more program comprising instructions for:
-
storing, at the client system, client metadata entries corresponding to a plurality of data objects stored on the client system, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client system, the client file name including a directory path; during a first phase of a synchronization process, sending, from the client system, one or more client metadata entries to a server system, each of the client metadata entries corresponding to a data object stored on the client system for which at least one metadata parameter has changed since a prior execution of the synchronization process; during a second phase of the synchronization process, receiving at the client system from the server system one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server system for which at least one metadata parameter has changed in the server metadata entry since a prior execution of the synchronization process, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server system, the server file name including a directory path;
wherein, when a client metadata entry has been rejected at the server system during the first phase, the one or more server metadata entries sent to the client system include at least one server metadata entry that conflicts with rejected client metadata entry;during the second phase of the synchronization process, accepting any received server metadata entry for which the client system does not have a corresponding client metadata entry; and during the second phase of the synchronization process, at the client system, identifying any received server metadata entry that contains one or more updated metadata parameters that conflicts with metadata parameters of a corresponding client metadata entry, requesting a user to select from among a predefined set of conflict resolutions to resolve the conflict, performing an action in accordance with the conflict resolution selected by the user, and accepting any received server metadata entry that does not conflict with a corresponding client metadata entry, wherein a client metadata entry corresponds to a received server metadata entry when the received server metadata entry contains a same identifier as the client metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match. - View Dependent Claims (27, 28, 29, 30, 31, 32, 33, 34)
-
-
19. A data objects synchronization system, comprising:
one or more processors; memory; and one or more programs stored in the memory, the one or more programs comprising; instructions to store, at a server system, server metadata entries corresponding to a plurality of data objects stored on the server system, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server system, the server file name including a directory path; instructions, to be executed during a first phase of a synchronization process, to receive at the server system one or more client metadata entries from a client system, each of the client metadata entries corresponding to a data object stored on the client system for which at least one metadata parameter has changed since a prior execution of the synchronization process, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client system, the client file name including a directory path; instructions, to be executed during the first phase of the synchronization process, to reject at the server system any received client metadata entry that contains one or more updated metadata parameters that conflicts with metadata parameters of a corresponding server metadata entry, and accepting any received client metadata entry that does not conflict a corresponding server metadata entry, wherein a server metadata entry corresponds to a received client metadata entry when the received client metadata entry contains a same identifier as the server metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match; instructions, to be executed during the first phase of the synchronization process, to accept any received client metadata entry for which the server system does not have a corresponding server metadata entry; instructions, to be executed during a second phase of the synchronization process, to send from the server system to the client system one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server system for which at least one metadata parameter has changed since a prior execution of the synchronization process;
wherein, when a client metadata entry has been rejected at the server system during the first phase, the one or more server metadata entries sent to the client system include at least one server metadata entry that conflicts with rejected client metadata entry.- View Dependent Claims (35, 36, 37, 38, 39, 40)
-
20. A client system, comprising:
-
one or more processors; memory; and one or more programs stored in the memory, the one or more programs comprising; instructions to store, at the client system, client metadata entries corresponding to a plurality of data objects stored on the client system, wherein each client metadata entry associates both an identifier and a client file name, distinct from the identifier, with a respective data object stored on the client system, the client file name including a directory path; instructions, to be executed during a first phase of a synchronization process, to send, from the client system, one or more client metadata entries to a server system, each of the client metadata entries corresponding to a data object stored on the client system for which at least one metadata parameter has changed since a prior execution of the synchronization process; instructions, to be executed during a second phase of the synchronization process, to receive at the client system from the server system one or more server metadata entries, each of the server metadata entries corresponding to a data object stored on the server system for which at least one metadata parameter has changed in the server metadata entry since a prior execution of the synchronization process, wherein each server metadata entry associates both an identifier and a server file name, distinct from the identifier, with a respective data object stored on the server system, the server file name including a directory path;
wherein, when a client metadata entry has been rejected at the server system during the first phase, the one or more server metadata entries sent to the client system include at least one server metadata entry that conflicts with rejected client metadata entry;instructions, to be executed during the second phase of the synchronization process, to accept any received server metadata entry for which the client system does not have a corresponding client metadata entry; and instructions, to be executed during the second phase of the synchronization process, to identify at the client system any received server metadata entry that contains one or more updated metadata parameters that conflicts with metadata parameters of a corresponding client metadata entry, requesting a user to select from among a predefined set of conflict resolutions to resolve the conflict, performing an action in accordance with the conflict resolution selected by the user, and accepting any received client metadata entry that does not conflict a corresponding server metadata entry, wherein a client metadata entry corresponds to a received server metadata entry when the received server metadata entry contains a same identifier as the client metadata entry without regard to whether the server file name and client file name of the server metadata entry and client metadata entry match. - View Dependent Claims (41, 42, 43, 44, 45, 46, 47, 48)
-
Specification