From f10846753750a38398d01845044f78c862f50c0c Mon Sep 17 00:00:00 2001
From: Todor Todorov <todor@peychev.com>
Date: Fri, 1 Dec 2017 18:43:34 +0100
Subject: [PATCH] fix postgres error \u0000 not allowed - removes \u0000 from
 json encoded data and strings imported from dynamodb

---
 .../migration/DynamoDBTableReplicator.java      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/citusdata/migration/DynamoDBTableReplicator.java b/src/main/java/com/citusdata/migration/DynamoDBTableReplicator.java
index 3629bf4..2e24b08 100644
--- a/src/main/java/com/citusdata/migration/DynamoDBTableReplicator.java
+++ b/src/main/java/com/citusdata/migration/DynamoDBTableReplicator.java
@@ -580,15 +580,15 @@ public static TableColumnValue columnValueFromDynamoValue(AttributeValue typedVa
 			return new TableColumnValue(TableColumnType.bool, value);
 		} else if (typedValue.getBS() != null) {
 			List<ByteBuffer> value = typedValue.getBS();
-			return new TableColumnValue(TableColumnType.jsonb, Jackson.toJsonString(value));
+			return new TableColumnValue(TableColumnType.jsonb, cleanupJson(Jackson.toJsonString(value)));
 		} else if (typedValue.getL() != null) {
 			List<AttributeValue> value = typedValue.getL();
 			List<Object> simpleList = InternalUtils.toSimpleList(value);
-			return new TableColumnValue(TableColumnType.jsonb, Jackson.toJsonString(simpleList));
+			return new TableColumnValue(TableColumnType.jsonb, cleanupJson(Jackson.toJsonString(simpleList)));
 		} else if (typedValue.getM() != null) {
-			Map<String,AttributeValue> value = typedValue.getM();
+			Map<String, AttributeValue> value = typedValue.getM();
 			Item simpleMap = Item.fromMap(InternalUtils.toSimpleMapValue(value));
-			return new TableColumnValue(TableColumnType.jsonb, simpleMap.toJSON());
+			return new TableColumnValue(TableColumnType.jsonb, cleanupJson(simpleMap.toJSON()));
 		} else if (typedValue.getN() != null) {
 			String value = typedValue.getN();
 			return new TableColumnValue(TableColumnType.numeric, value);
@@ -596,16 +596,19 @@ public static TableColumnValue columnValueFromDynamoValue(AttributeValue typedVa
 			List<String> value = typedValue.getNS();
 			return new TableColumnValue(TableColumnType.jsonb, Jackson.toJsonString(value));
 		} else if (typedValue.getS() != null) {
-			String value = typedValue.getS();
-			return new TableColumnValue(TableColumnType.text, value);
+			return new TableColumnValue(TableColumnType.text, cleanupJson(typedValue.getS()));
 		} else if (typedValue.getSS() != null) {
 			List<String> value = typedValue.getSS();
-			return new TableColumnValue(TableColumnType.jsonb, Jackson.toJsonString(value));
+			return new TableColumnValue(TableColumnType.jsonb, cleanupJson(Jackson.toJsonString(value)));
 		} else {
 			return null;
 		}
 	}
 
+	private static String cleanupJson(String value) {
+		return value.replaceAll("\\\\u0000", "").replaceAll("\u0000", "");
+	}
+
 	public static TableColumnType columnTypeFromDynamoValue(AttributeValue typedValue) {
 		if(typedValue.getB() != null) {
 			return TableColumnType.bytea;