Removing CONTAINER_MEMORY_MB; Removing references to HDS
diff --git a/apps/logstream/src/main/resources/com/datatorrent/apps/logstream/dt-site-sample.xml b/apps/logstream/src/main/resources/com/datatorrent/apps/logstream/dt-site-sample.xml
index 36c94b7..799a2f0 100644
--- a/apps/logstream/src/main/resources/com/datatorrent/apps/logstream/dt-site-sample.xml
+++ b/apps/logstream/src/main/resources/com/datatorrent/apps/logstream/dt-site-sample.xml
@@ -14,7 +14,7 @@
</property>
<property>
- <name>dt.attr.CONTAINER_MEMORY_MB</name>
+ <name>dt.operator.*.attr.MEMORY_MB</name>
<value>512</value>
</property>
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java b/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java
index 5591825..9c1fa85 100644
--- a/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java
+++ b/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java
@@ -47,7 +47,6 @@
TestAccumuloOutputOperator taop = dag.addOperator("testaccumulooperator", TestAccumuloOutputOperator.class);
dag.addStream("ss", rtg.outputPort, taop.input);
com.datatorrent.api.Attribute.AttributeMap attributes = dag.getAttributes();
- //attributes.put(com.datatorrent.api.Context.DAGContext.CONTAINER_MEMORY_MB, 4096);
taop.getStore().setTableName("tab1");
taop.getStore().setZookeeperHost("127.0.0.1");
taop.getStore().setInstanceName("instance");
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 1d5990f..a1f30fe 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -531,6 +531,8 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
<version>0.13.1</version>
+ </dependency>
+ <dependency>
<groupId>net.spy</groupId>
<artifactId>spymemcached</artifactId>
<version>2.11.4</version>
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hdht/HDSFileExporter.java b/contrib/src/main/java/com/datatorrent/contrib/hdht/HDSFileExporter.java
index df8a248..69a0228 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hdht/HDSFileExporter.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hdht/HDSFileExporter.java
@@ -15,6 +15,7 @@
*/
package com.datatorrent.contrib.hdht;
+import com.datatorrent.contrib.hdht.HDHTFileAccess;
import java.io.IOException;
import java.util.Set;
@@ -23,5 +24,5 @@
*/
public interface HDSFileExporter
{
- void exportFiles(HDSFileAccess store, long bucketKey, Set<String> filesAdded, Set<String> filesRemoved) throws IOException;
+ void exportFiles(HDHTFileAccess store, long bucketKey, Set<String> filesAdded, Set<String> filesRemoved) throws IOException;
}
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hdht/export/AbstractHiveORCExporter.java b/contrib/src/main/java/com/datatorrent/contrib/hdht/export/AbstractHiveORCExporter.java
index 0a54c80..d4013da 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hdht/export/AbstractHiveORCExporter.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hdht/export/AbstractHiveORCExporter.java
@@ -22,8 +22,8 @@
import com.datatorrent.common.util.DTThrowable;
import com.datatorrent.common.util.Slice;
import com.datatorrent.contrib.hdht.HDHTCodec;
-import com.datatorrent.contrib.hds.HDSFileAccess;
-import com.datatorrent.contrib.hds.HDSFileAccess.HDSFileReader;
+import com.datatorrent.contrib.hdht.HDHTFileAccess;
+import com.datatorrent.contrib.hdht.HDHTFileAccess.*;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -232,7 +232,7 @@
}
@Override
- public void exportFiles(HDSFileAccess store, long bucketKey, Set<String> filesAdded, Set<String> filesRemoved) throws IOException {
+ public void exportFiles(HDHTFileAccess store, long bucketKey, Set<String> filesAdded, Set<String> filesRemoved) throws IOException {
HDSFileReader reader = null;
HDHTCodec<EVENT> codec = getCodec();
diff --git a/demos/frauddetect/src/test/resources/dt-site-frauddetect.xml b/demos/frauddetect/src/test/resources/dt-site-frauddetect.xml
index 75d17e6..fbd30e8 100644
--- a/demos/frauddetect/src/test/resources/dt-site-frauddetect.xml
+++ b/demos/frauddetect/src/test/resources/dt-site-frauddetect.xml
@@ -142,10 +142,6 @@
<name>dt.application.FraudDetectDemo.port.*.attr.QUEUE_CAPACITY</name>
<value>32000</value>
</property>
- <property>
- <name>dt.application.FraudDetectDemo.attr.CONTAINER_MEMORY_MB</name>
- <value>2048</value>
- </property>
</configuration>
diff --git a/demos/mobile/src/test/resources/dt-site-mobile.xml b/demos/mobile/src/test/resources/dt-site-mobile.xml
index d3e25bf..c4e6c5b 100644
--- a/demos/mobile/src/test/resources/dt-site-mobile.xml
+++ b/demos/mobile/src/test/resources/dt-site-mobile.xml
@@ -61,7 +61,7 @@
<value>queryTopic</value>
</property>
<property>
- <name>dt.application.MobileDemo.attr.CONTAINER_MEMORY_MB</name>
+ <name>dt.operator.*.attr.MEMORY_MB</name>
<value>2048</value>
</property>
<property>
