I guess attachments aren't allowed. Pasting the patch below:
>From f153fdd8d270529081e166dfe58c433c53508750 Mon Sep 17 00:00:00 2001 From: Kanak Biscuitwala <[email protected]> Date: Mon, 5 Aug 2013 12:47:42 -0700 Subject: [PATCH] HELIX-194: ZNRecord has too many constructors --- .../src/main/java/org/apache/helix/ZNRecord.java | 26 ++------------------ .../serializer/TestJacksonPayloadSerializer.java | 9 ++++--- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/helix-core/src/main/java/org/apache/helix/ZNRecord.java b/helix-core/src/main/java/org/apache/helix/ZNRecord.java index 4e6080a..130d673 100644 --- a/helix-core/src/main/java/org/apache/helix/ZNRecord.java +++ b/helix-core/src/main/java/org/apache/helix/ZNRecord.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.TreeMap; import org.apache.helix.ZNRecordDelta.MergeOperation; +import org.apache.helix.manager.zk.serializer.JacksonPayloadSerializer; import org.apache.helix.manager.zk.serializer.PayloadSerializer; import org.apache.log4j.Logger; import org.codehaus.jackson.annotate.JsonCreator; @@ -74,12 +75,7 @@ public class ZNRecord mapFields = new TreeMap<String, Map<String, String>>(); listFields = new TreeMap<String, List<String>>(); rawPayload = new byte[0]; - } - - public ZNRecord(String id, PayloadSerializer serializer) - { - this(id); - _serializer = serializer; + _serializer = new JacksonPayloadSerializer(); } public ZNRecord(ZNRecord record) @@ -100,24 +96,6 @@ public class ZNRecord _modifiedTime = record.getModifiedTime(); } - public ZNRecord(ZNRecord record, int version) - { - this(record); - _version = version; - } - - public ZNRecord(ZNRecord record, String id, PayloadSerializer serializer) - { - this(record, id); - _serializer = serializer; - } - - public ZNRecord(ZNRecord record, int version, PayloadSerializer serializer) - { - this(record, version); - _serializer = serializer; - } - @JsonIgnore(true) public void setPayloadSerializer(PayloadSerializer serializer) { diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java b/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java index 0c4bc66..8d03ec5 100644 --- a/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java +++ b/helix-core/src/test/java/org/apache/helix/manager/zk/serializer/TestJacksonPayloadSerializer.java @@ -40,7 +40,8 @@ public class TestJacksonPayloadSerializer { final String RECORD_ID = "testJacksonSerializeDeserialize"; SampleDeserialized sample = getSample(); - ZNRecord znRecord = new ZNRecord(RECORD_ID, new JacksonPayloadSerializer()); + ZNRecord znRecord = new ZNRecord(RECORD_ID); + znRecord.setPayloadSerializer(new JacksonPayloadSerializer()); znRecord.setPayload(sample); SampleDeserialized duplicate = znRecord.getPayload(SampleDeserialized.class); Assert.assertEquals(duplicate, sample); @@ -55,7 +56,8 @@ public class TestJacksonPayloadSerializer { final String RECORD_ID = "testFullZNRecordSerializeDeserialize"; SampleDeserialized sample = getSample(); - ZNRecord znRecord = new ZNRecord(RECORD_ID, new JacksonPayloadSerializer()); + ZNRecord znRecord = new ZNRecord(RECORD_ID); + znRecord.setPayloadSerializer(new JacksonPayloadSerializer()); znRecord.setPayload(sample); ZNRecordSerializer znRecordSerializer = new ZNRecordSerializer(); byte[] serialized = znRecordSerializer.serialize(znRecord); @@ -74,7 +76,8 @@ public class TestJacksonPayloadSerializer { final String RECORD_ID = "testFullZNRecordStreamingSerializeDeserialize"; SampleDeserialized sample = getSample(); - ZNRecord znRecord = new ZNRecord(RECORD_ID, new JacksonPayloadSerializer()); + ZNRecord znRecord = new ZNRecord(RECORD_ID); + znRecord.setPayloadSerializer(new JacksonPayloadSerializer()); znRecord.setPayload(sample); ZNRecordStreamingSerializer znRecordSerializer = new ZNRecordStreamingSerializer(); byte[] serialized = znRecordSerializer.serialize(znRecord); -- 1.7.10.2 (Apple Git-33) From: Kanak Biscuitwala <[email protected]<mailto:[email protected]>> Reply-To: "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>> Date: Monday, August 5, 2013 1:08 PM To: "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>> Subject: Re: Problem creating review request From: Kanak Biscuitwala <[email protected]<mailto:[email protected]>> Reply-To: "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>> Date: Monday, August 5, 2013 1:06 PM To: "[email protected]<mailto:[email protected]>" <[email protected]<mailto:[email protected]>> Subject: Problem creating review request Hi, I'm trying to submit the attached Helix patch to the review board, but always get the following error: The file 'helix-core/src/main/java/org/apache/helix/ZNRecord.java' (r4e6080a) could not be found in the repository The patch is directly off master and worked fine when Jason and I tried applying it locally. Anyone have any ideas about how to proceed? Thanks, Kanak
