Skip to content

Commit ff20b51

Browse files
timeckljacomet
authored andcommitted
trim the set of logical operations
git-svn-id: https://svn.terracotta.org/repo/tc/tc-messaging/branches/private/voltron@26019 7fc7bbf3-cf45-46d4-be06-341739edd864
1 parent 7bb8acc commit ff20b51

File tree

3 files changed

+2
-30
lines changed

3 files changed

+2
-30
lines changed

src/main/java/com/tc/object/LogicalOperation.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,10 @@
1010
* @author cdennis
1111
*/
1212
public enum LogicalOperation {
13-
14-
ADD, //L2:ListManagedObjectState L1:ToolkitListImplApplicator L1:ToolkitListImpl
15-
ADD_ALL, //L1:ToolkitListImpl
16-
ADD_ALL_AT, //L1:ToolkitListImpl
17-
ADD_AT, //L2:ListManagedObjectState L1:ToolkitListImplApplicator L1:ToolkitListImpl
18-
PUT, //bunches of places...
19-
CLEAR,
20-
REMOVE,
21-
REMOVE_AT,
22-
SET,
23-
REMOVE_RANGE,
24-
REPLACE_IF_VALUE_EQUAL,
25-
PUT_IF_ABSENT,
26-
REMOVE_IF_VALUE_EQUAL,
27-
CLEAR_LOCAL_CACHE,
28-
EVICTION_COMPLETED,
29-
CLUSTERED_NOTIFIER,
30-
DESTROY,
31-
FIELD_CHANGED,
32-
INT_FIELD_CHANGED,
33-
SET_LAST_ACCESSED_TIME,
34-
EXPIRE_IF_VALUE_EQUAL,
35-
PUT_VERSIONED,
36-
REMOVE_VERSIONED,
37-
PUT_IF_ABSENT_VERSIONED,
38-
CLEAR_VERSIONED,
3913
REGISTER_SERVER_EVENT_LISTENER,
4014
UNREGISTER_SERVER_EVENT_LISTENER,
4115
REGISTER_SERVER_EVENT_LISTENER_PASSIVE,
4216
UNREGISTER_SERVER_EVENT_LISTENER_PASSIVE,
4317
REMOVE_EVENT_LISTENING_CLIENT,
44-
NO_OP,
45-
CREATE_ENTITY,
4618
INVOKE_WITH_PAYLOAD;
4719
}

src/test/java/com/tc/object/dna/impl/DNAImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected void serializeDeserialize(final boolean isDelta) throws Exception {
5454
final DNAEncodingInternal encoding = new ApplicatorDNAEncodingImpl(classProvider);
5555
final DNAWriter dnaWriter = createDNAWriter(out, id, type, serializer, encoding, isDelta);
5656
final PhysicalAction action1 = new PhysicalAction("class.field1", new Integer(1), false);
57-
final LogicalAction action2 = new LogicalAction(LogicalOperation.PUT, new Object[] { "key", "value" });
57+
final LogicalAction action2 = new LogicalAction(LogicalOperation.INVOKE_WITH_PAYLOAD, new Object[] { "key", "value" });
5858
final PhysicalAction action3 = new PhysicalAction("class.field2", new ObjectID(3), true);
5959

6060

src/test/java/com/tc/object/dna/impl/VersionizedDNAWrapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testResettingDNACursor() throws Exception {
4242
final DNAEncodingInternal encoding = new ApplicatorDNAEncodingImpl(classProvider);
4343
final DNAWriter dnaWriter = createDNAWriter(out, id, type, serializer, encoding, "loader description");
4444
final PhysicalAction action1 = new PhysicalAction("class.field1", new Integer(1), false);
45-
final LogicalAction action2 = new LogicalAction(LogicalOperation.PUT, new Object[] { "key", "value" });
45+
final LogicalAction action2 = new LogicalAction(LogicalOperation.INVOKE_WITH_PAYLOAD, new Object[] { "key", "value" });
4646
final PhysicalAction action3 = new PhysicalAction("class.field2", new ObjectID(3), true);
4747
dnaWriter.addPhysicalAction(action1.getFieldName(), action1.getObject());
4848
dnaWriter.addLogicalAction(action2.getLogicalOperation(), action2.getParameters(), LogicalChangeID.NULL_ID);

0 commit comments

Comments
 (0)