Made ObjectCreation.FieldCopy lenient for MissingNodes to support out…

…er joins better
stratosphere · Jan 17, 2014 · b197add · b197add
1 parent a7a491e
commit b197add
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/sopremo/sopremo-base/src/test/java/eu/stratosphere/sopremo/base/TwoSourceJoinTest.java b/sopremo/sopremo-base/src/test/java/eu/stratosphere/sopremo/base/TwoSourceJoinTest.java
@@ -191,7 +191,6 @@ public void shouldPerformFullOuterTwoSourceJoin() {
 	}
 
 	@Test
-	@Ignore
 	public void shouldPerformFullOuterTwoSourceJoin2() {
 		final SopremoTestPlan sopremoPlan = new SopremoTestPlan(2, 1);
 
@@ -206,7 +205,6 @@ public void shouldPerformFullOuterTwoSourceJoin2() {
 				new ObjectCreation.CopyFields(new InputSelection(1)),
 				new ObjectCreation.FieldAssignment("worksFor", JsonUtil.createPath("0", "worksFor"))));
 		join.setInputs(sopremoPlan.getInputOperators(0, 2));
-		join.setResultProjection(ObjectCreation.CONCATENATION);
 		sopremoPlan.getOutputOperator(0).setInputs(join);
 		sopremoPlan.getInput(0).
 			addObject("biographyId", "A000029", "worksFor", "CompanyXYZ").
@@ -219,10 +217,9 @@ public void shouldPerformFullOuterTwoSourceJoin2() {
 		sopremoPlan.getExpectedOutput(0).
 			addObject("biography", "A000029", "id", "usCongress1", "income", 1, "name", "Andrew Adams", "worksFor",
 				"CompanyXYZ").
-			addObject("biography", "A000039", "id", "usCongress2", "income", 1, "name", "John Adams", "worksFor",
-				"CompanyUVW").
-			addObject("biography", "A000049", "worksFor", "CompanyABC").
-			addObject("biography", "A000059", "id", "usCongress3", "income", 1, "name", "Andrew Adams");
+			addObject("biography", "A000039", "id", "usCongress2", "income", 1, "name", "John Adams").
+			addObject("worksFor", "CompanyABC").
+			addObject("biography", "A000059", "id", "usCongress3", "income", 1, "name", "John Doe", "worksFor", "CompanyUVW");
 
 		sopremoPlan.trace();
 		sopremoPlan.run();

diff --git a/sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/expressions/ObjectCreation.java b/sopremo/sopremo-common/src/main/java/eu/stratosphere/sopremo/expressions/ObjectCreation.java
@@ -221,7 +221,8 @@ public PathSegmentExpression getTargetExpression() {
 		@Override
 		protected void evaluate(final IJsonNode node, final IObjectNode target) {
 			final IJsonNode exprNode = this.getExpression().evaluate(node);
-			target.putAll((IObjectNode) exprNode);
+			if (!(exprNode instanceof MissingNode))
+				target.putAll((IObjectNode) exprNode);
 		}
 	}