Removed sopremo cleansing and sdaa11 packages; they will later be add…

…ed in a separate branch
VonRosenchild · Jun 22, 2012 · 0082ea9 · 0082ea9
1 parent 5744fc0
commit 0082ea9
Show file tree

Hide file tree

Showing 155 changed files with 8 additions and 16,477 deletions.
diff --git a/...e/nephele-server/src/main/java/eu/stratosphere/nephele/executiongraph/ExecutionGraph.java b/...e/nephele-server/src/main/java/eu/stratosphere/nephele/executiongraph/ExecutionGraph.java
@@ -1200,10 +1200,10 @@ private static InternalJobStatus determineNewJobStatus(final ExecutionGraph eg,
  }
  break;
  case CANCELED:
- LOG.error("Received update of execute state in job status CANCELED");
+ LOG.error("Received update of execute state in job status CANCELED: " + eg.getJobID());
  break;
  case FINISHED:
- LOG.error("Received update of execute state in job status FINISHED");
+ LOG.error("Received update of execute state in job status FINISHED: " + eg.getJobID());
  break;
  }
 

diff --git a/sopremo/pom.xml b/sopremo/pom.xml
@@ -97,5 +97,6 @@
  <modules>
  <module>sopremo-common</module>
  <module>sopremo-base</module>
+ <module>sopremo-query</module>
  </modules>
 </project>
diff --git a/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/GlobalEnumeration.java b/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/GlobalEnumeration.java
@@ -69,6 +69,7 @@ public IJsonNode evaluate(IJsonNode node, IJsonNode target, EvaluationContext co
  private static final EvaluationExpression AUTO = new EvaluationExpression() {
  private static final long serialVersionUID = -5506784974227617703L;
 
+ @Override
  public IJsonNode set(IJsonNode node, IJsonNode value, EvaluationContext context) {
  if (node.isObject()) {
  ((IObjectNode) node).put("id", value);
@@ -80,6 +81,7 @@ public IJsonNode set(IJsonNode node, IJsonNode value, EvaluationContext context)
  return objectNode;
  }
 
+ @Override
  public IJsonNode evaluate(IJsonNode node, IJsonNode target, EvaluationContext context) {
  return node;
  }
@@ -149,7 +151,7 @@ public void open(Configuration parameters) {
  protected void map(final IJsonNode value, final JsonCollector out) {
  this.counter.setValue(this.counter.getLongValue() + 1);
  final IJsonNode id = this.idGeneration.evaluate(this.params, this.getContext());
- out.collect(this.enumerationExpression.set(value, id, getContext()));
+ out.collect(this.enumerationExpression.set(value, id, this.getContext()));
  }
  }
 

diff --git a/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/Join.java b/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/Join.java
@@ -18,7 +18,6 @@
 import eu.stratosphere.sopremo.expressions.ArrayAccess;
 import eu.stratosphere.sopremo.expressions.BinaryBooleanExpression;
 import eu.stratosphere.sopremo.expressions.BooleanExpression;
-import eu.stratosphere.sopremo.expressions.ConstantExpression;
 import eu.stratosphere.sopremo.expressions.EvaluationExpression;
 import eu.stratosphere.sopremo.expressions.InputSelection;
 import eu.stratosphere.sopremo.expressions.ObjectCreation;
@@ -65,7 +64,7 @@ public void setJoinCondition(BooleanExpression joinCondition) {
  throw new IllegalArgumentException("No join condition given");
 
  this.joinCondition = joinCondition;
- binaryConditions = expressions;
+ this.binaryConditions = expressions;
  }
 
  public Join withResultProjection(EvaluationExpression resultProjection) {
@@ -170,7 +169,7 @@ public BooleanExpression getJoinCondition() {
 
  private List<TwoSourceJoin> getInitialJoinOrder(SopremoModule module) {
  final List<TwoSourceJoin> joins = new ArrayList<TwoSourceJoin>();
- for (final BinaryBooleanExpression expression : binaryConditions)
+ for (final BinaryBooleanExpression expression : this.binaryConditions)
  joins.add(this.getTwoSourceJoinForExpression(expression, module));
 
  // TODO: add some kind of optimization?

diff --git a/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/OperatorUtil.java b/sopremo/sopremo-base/src/main/java/eu/stratosphere/sopremo/base/OperatorUtil.java
@@ -20,7 +20,6 @@
 import eu.stratosphere.sopremo.expressions.ArrayCreation;
 import eu.stratosphere.sopremo.expressions.ConstantExpression;
 import eu.stratosphere.sopremo.expressions.EvaluationExpression;
-import eu.stratosphere.sopremo.expressions.InputSelection;
 
 /**
  * Some convenience method to implement complex operators.

diff --git a/sopremo/sopremo-cleansing/build.properties b/sopremo/sopremo-cleansing/build.properties
diff --git a/sopremo/sopremo-cleansing/build.xml b/sopremo/sopremo-cleansing/build.xml