Merge pull request zendesk#58 from zendesk/ben/add_ts

Ben Osheroff · Ben Osheroff · commit a08bcc16ae82 · 2015-06-09T09:55:23.000-07:00
add a timestamp to the row event.
diff --git a/src/main/java/com/zendesk/maxwell/MaxwellAbstractRowsEvent.java b/src/main/java/com/zendesk/maxwell/MaxwellAbstractRowsEvent.java
@@ -20,6 +20,11 @@
 import com.zendesk.maxwell.schema.Table;
 import com.zendesk.maxwell.schema.columndef.ColumnDef;
 
+// the main wrapper for a raw (AbstractRowEvent) binlog event.
+// decorates the event with metadata info from Table,
+// filters rows using the passed in MaxwellFilter,
+// and ultimately outputs arrays of json objects representing each row.
+
 public abstract class MaxwellAbstractRowsEvent extends AbstractRowEvent {
 	private final MaxwellFilter filter;
 	private final AbstractRowEvent event;
@@ -188,6 +193,10 @@ public void setDatabase(String name) {
 			this.put("database", name);
 		}
 
+		public void setTimestamp(Long l) {
+			this.put("ts", l);
+		}
+
 		public Object getData(String string) {
 			return this.data.get(string);
 		}
@@ -202,6 +211,7 @@ public List<RowMap> jsonMaps() {
 			rowMap.setRowType(getType());
 			rowMap.setTable(getTable().getName());
 			rowMap.setDatabase(getDatabase().getName());
+			rowMap.setTimestamp(getHeader().getTimestamp() / 1000);
 
 			Iterator<Column> colIter = r.getColumns().iterator();
 			Iterator<ColumnDef> defIter = table.getColumnList().iterator();
diff --git a/src/main/java/com/zendesk/maxwell/MaxwellJSONObject.java b/src/main/java/com/zendesk/maxwell/MaxwellJSONObject.java
@@ -12,6 +12,7 @@ public MaxwellJSONObject(RowMap map) {
 		super(map);
 	}
 
+	// this preserves the key's output order.  vanity, I know, but nice.
 	@Override
 	public Set<String> keySet() {
 		LinkedHashSet<String> set = new LinkedHashSet<>();
@@ -20,6 +21,7 @@ public Set<String> keySet() {
 		set.add("table");
 		set.add("type");
 		set.add("data");
+		set.add("ts");
 
 		return set;
 	}
diff --git a/src/test/java/com/zendesk/maxwell/MaxwellIntegrationTest.java b/src/test/java/com/zendesk/maxwell/MaxwellIntegrationTest.java
@@ -169,6 +169,10 @@ private void runJSONTest(List<String> sql, List<JSONObject> assertJSON) throws E
 
 		for ( MaxwellAbstractRowsEvent e : events ) {
 			for ( JSONObject a : e.toJSONObjects() ) {
+				// undo maxwell's fancy ordering stuff -- it's preventing us from removing the ts column.
+				a = new JSONObject(a.toString());
+				a.remove("ts");
+
 				eventJSON.add(a);
 
 				for ( JSONObject b : assertJSON ) {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public MaxwellJSONObject(RowMap map) {`
`12`	`12`	`super(map);`
`13`	`13`	`}`
`14`	`14`
	`15`	`+ // this preserves the key's output order. vanity, I know, but nice.`
`15`	`16`	`@Override`
`16`	`17`	`public Set<String> keySet() {`
`17`	`18`	`LinkedHashSet<String> set = new LinkedHashSet<>();`
`@@ -20,6 +21,7 @@ public Set<String> keySet() {`
`20`	`21`	`set.add("table");`
`21`	`22`	`set.add("type");`
`22`	`23`	`set.add("data");`
	`24`	`+ set.add("ts");`
`23`	`25`
`24`	`26`	`return set;`
`25`	`27`	`}`