asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject [50/51] [partial] incubator-asterixdb git commit: Run ExecutionTest w/integration test framework
Date Fri, 11 Dec 2015 20:58:39 GMT
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/pom.xml
----------------------------------------------------------------------
diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml
index 66382e6..0360529 100644
--- a/asterix-app/pom.xml
+++ b/asterix-app/pom.xml
@@ -83,6 +83,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 990decc..0145651 100644
--- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -107,7 +107,7 @@ public class AsterixHyracksIntegrationUtil {
     public static String[] getNcNames() {
         String[] names = new String[NODES];
         for (int n = 0; n < NODES; ++n) {
-            names[n] = "nc" + (n + 1);
+            names[n] = "asterix_nc" + (n + 1);
         }
         return names;
     }
@@ -115,7 +115,7 @@ public class AsterixHyracksIntegrationUtil {
     public static String[] getDataDirs() {
         String[] names = new String[NODES];
         for (int n = 0; n < NODES; ++n) {
-            names[n] = "nc" + (n + 1) + "data";
+            names[n] = "asterix_nc" + (n + 1) + "data";
         }
         return names;
     }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/main/resources/asterix-build-configuration.xml
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/resources/asterix-build-configuration.xml b/asterix-app/src/main/resources/asterix-build-configuration.xml
index 8d0b7f3..fa20099 100644
--- a/asterix-app/src/main/resources/asterix-build-configuration.xml
+++ b/asterix-app/src/main/resources/asterix-build-configuration.xml
@@ -17,22 +17,22 @@
  ! under the License.
  !-->
 <asterixConfiguration xmlns="asterixconf">
-	<metadataNode>nc1</metadataNode>
+	<metadataNode>asterix_nc1</metadataNode>
 	<store>
-		<ncId>nc1</ncId>
-		<storeDirs>nc1data</storeDirs>
+		<ncId>asterix_nc1</ncId>
+		<storeDirs>asterix_nc1data</storeDirs>
 	</store>
 	<store>
-		<ncId>nc2</ncId>
-		<storeDirs>nc2data</storeDirs>
+		<ncId>asterix_nc2</ncId>
+		<storeDirs>asterix_nc2data</storeDirs>
 	</store>
 	<transactionLogDir>
-		<ncId>nc1</ncId>
-		<txnLogDirPath>target/txnLogDir/nc1</txnLogDirPath>
+		<ncId>asterix_nc1</ncId>
+		<txnLogDirPath>target/txnLogDir/asterix_nc1</txnLogDirPath>
 	</transactionLogDir>
 	<transactionLogDir>
-		<ncId>nc2</ncId>
-		<txnLogDirPath>target/txnLogDir/nc2</txnLogDirPath>
+		<ncId>asterix_nc2</ncId>
+		<txnLogDirPath>target/txnLogDir/asterix_nc2</txnLogDirPath>
 	</transactionLogDir>
 
 	<property>
@@ -56,7 +56,7 @@
 	</property>
 	<property>
 		<name>compiler.sortmemory</name>
-		<value>163840</value>
+		<value>327680</value>
 	</property>
 	<property>
 		<name>compiler.groupmemory</name>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java b/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java
index 80f5f5a..ef1629b 100644
--- a/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java
+++ b/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorAPIServletTest.java
@@ -94,8 +94,8 @@ public class ConnectorAPIServletTest {
         when(mockInfo2.getNetworkAddress()).thenReturn(new NetworkAddress("127.0.0.2", 3099));
 
         // Calls ConnectorAPIServlet.formResponseObject.
-        nodeMap.put("nc1", mockInfo1);
-        nodeMap.put("nc2", mockInfo2);
+        nodeMap.put("asterix_nc1", mockInfo1);
+        nodeMap.put("asterix_nc2", mockInfo2);
         servlet.doGet(mockRequest, mockResponse);
 
         // Constructs the actual response.
@@ -126,8 +126,8 @@ public class ConnectorAPIServletTest {
         ConnectorAPIServlet servlet = new ConnectorAPIServlet();
         JSONObject actualResponse = new JSONObject();
         FileSplit[] splits = new FileSplit[2];
-        splits[0] = new FileSplit("nc1", "foo1");
-        splits[1] = new FileSplit("nc2", "foo2");
+        splits[0] = new FileSplit("asterix_nc1", "foo1");
+        splits[1] = new FileSplit("asterix_nc2", "foo2");
         Map<String, NodeControllerInfo> nodeMap = new HashMap<String, NodeControllerInfo>();
         NodeControllerInfo mockInfo1 = mock(NodeControllerInfo.class);
         NodeControllerInfo mockInfo2 = mock(NodeControllerInfo.class);
@@ -142,8 +142,8 @@ public class ConnectorAPIServletTest {
         String primaryKey = "a1";
 
         // Calls ConnectorAPIServlet.formResponseObject.
-        nodeMap.put("nc1", mockInfo1);
-        nodeMap.put("nc2", mockInfo2);
+        nodeMap.put("asterix_nc1", mockInfo1);
+        nodeMap.put("asterix_nc2", mockInfo2);
         PA.invokeMethod(servlet,
                 "formResponseObject(org.json.JSONObject, org.apache.hyracks.dataflow.std.file.FileSplit[], "
                         + "org.apache.asterix.om.types.ARecordType, java.lang.String, boolean, java.util.Map)",

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
index 9961dc8..eefd40e 100644
--- a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
+++ b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java
@@ -60,9 +60,13 @@ public class HDFSCluster {
      * Called prior to running the Runtime test suite.
      */
     public void setup() throws Exception {
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml"));
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/hdfs-site.xml"));
+        setup("");
+    }
+
+    public void setup(String basePath) throws Exception {
+        conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/core-site.xml"));
+        conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
+        conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/hdfs-site.xml"));
         cleanupLocal();
         //this constructor is deprecated in hadoop 2x
         //dfsCluster = new MiniDFSCluster(nameNodePort, conf, numDataNodes, true, true, StartupOption.REGULAR, null);
@@ -72,13 +76,13 @@ public class HDFSCluster {
         build.startupOption(StartupOption.REGULAR);
         dfsCluster = build.build();
         dfs = FileSystem.get(conf);
-        loadData();
+        loadData(basePath);
     }
 
-    private void loadData() throws IOException {
+    private void loadData(String localDataRoot) throws IOException {
         Path destDir = new Path(HDFS_PATH);
         dfs.mkdirs(destDir);
-        File srcDir = new File(DATA_PATH);
+        File srcDir = new File(localDataRoot + DATA_PATH);
         File[] listOfFiles = srcDir.listFiles();
         for (File srcFile : listOfFiles) {
             Path path = new Path(srcFile.getAbsolutePath());

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/dapd/denorm_user_event.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dapd/denorm_user_event.aql b/asterix-app/src/test/resources/dapd/denorm_user_event.aql
index d05383f..053fc58 100644
--- a/asterix-app/src/test/resources/dapd/denorm_user_event.aql
+++ b/asterix-app/src/test/resources/dapd/denorm_user_event.aql
@@ -43,12 +43,12 @@ declare type EventType as {
   end_time: datetime
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) primary key u_name on group1;
 declare dataset Events(EventType) primary key e_name on group1;
 
-write output to nc1:"/tmp/denorm_user_event.adm";
+write output to asterix_nc1:"/tmp/denorm_user_event.adm";
 
 for $u in dataset('Users')
 let $events := 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/dapd/q1.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dapd/q1.aql b/asterix-app/src/test/resources/dapd/q1.aql
index 614af17..e0de0eb 100644
--- a/asterix-app/src/test/resources/dapd/q1.aql
+++ b/asterix-app/src/test/resources/dapd/q1.aql
@@ -39,11 +39,11 @@ declare type AddressType as closed {
   latlong: point
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset User(UserType) primary key name on group1;
 
-write output to nc1:"/tmp/q1.adm";
+write output to asterix_nc1:"/tmp/q1.adm";
 
 for $user in dataset('User')
 where some $i in $user.interests

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/dapd/q2.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dapd/q2.aql b/asterix-app/src/test/resources/dapd/q2.aql
index 0d2795c..464bf8b 100644
--- a/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterix-app/src/test/resources/dapd/q2.aql
@@ -46,11 +46,11 @@ declare type AddressType as closed {
   latlong: point
 }
 
-declare nodegroup group1 on nc1;
+declare nodegroup group1 on asterix_nc1;
 
 /*
 declare dataset Event(EventType) 
-  splits nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
+  splits asterix_nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
 */
 
 drop dataset Event;
@@ -59,9 +59,9 @@ declare dataset Event(EventType)
 
 load dataset Event 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
+(("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
 
-write output to nc1:"/tmp/dapd_q2.adm";
+write output to asterix_nc1:"/tmp/dapd_q2.adm";
 
 for $event in dataset('Event')
 for $sponsor in $event.sponsoring_sigs

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/create-index.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/create-index.aql b/asterix-app/src/test/resources/demo0927/local/create-index.aql
index 186c66e..d14e965 100644
--- a/asterix-app/src/test/resources/demo0927/local/create-index.aql
+++ b/asterix-app/src/test/resources/demo0927/local/create-index.aql
@@ -35,7 +35,7 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1,nc2;
+declare nodegroup group1 on asterix_nc1,asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql b/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
index 9722aa1..dfd4d1f 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
@@ -35,12 +35,12 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 where $c.age < 21 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql b/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
index 9a3a955..dea955e 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
@@ -35,12 +35,12 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 where $c.name = 'Noreen Doe' 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql b/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
index 9a241d3..47905c5 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
@@ -35,12 +35,12 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/declare-index.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/declare-index.aql b/asterix-app/src/test/resources/demo0927/local/declare-index.aql
index 176176c..df13f9b 100644
--- a/asterix-app/src/test/resources/demo0927/local/declare-index.aql
+++ b/asterix-app/src/test/resources/demo0927/local/declare-index.aql
@@ -35,7 +35,7 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1,nc2;
+declare nodegroup group1 on asterix_nc1,asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql b/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
index f2d8c8b..e2dca16 100644
--- a/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
+++ b/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
@@ -45,14 +45,14 @@ declare type OrderType as closed {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-write output to nc1:"/tmp/custorder.adm";
+write output to asterix_nc1:"/tmp/custorder.adm";
 
 for $c in dataset('Customers')
 for $o in dataset('Orders')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/load-cust.aql b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
index cb8d591..71ce704 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-cust.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
@@ -35,12 +35,12 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo0927/local/load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/load-ord.aql b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
index 5196588..8377df6 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-ord.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
@@ -27,12 +27,12 @@ declare type OrderType as closed {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-load dataset Orders from nc1:"/tmp/orderData.json";
+load dataset Orders from asterix_nc1:"/tmp/orderData.json";
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
index 9f3f7e3..15d4d78 100644
--- a/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
@@ -35,12 +35,12 @@ declare type AddressType as open {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql b/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
index c46d422..5feb7ac 100644
--- a/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
+++ b/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
@@ -35,12 +35,12 @@ declare type AddressType as open {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 where $c.age < 21

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
index 75edfa9..367d1d6 100644
--- a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
+++ b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
@@ -27,11 +27,11 @@ declare type OrderType as open {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
 load dataset Orders 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql b/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
index d492520..90d5543 100644
--- a/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
+++ b/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
@@ -45,14 +45,14 @@ declare type OrderType as open {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-write output to nc1:"/tmp/custorder.adm";
+write output to asterix_nc1:"/tmp/custorder.adm";
 
 for $c in dataset('Customers')
 for $o in dataset('Orders')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
index 5a3faf4..fab7181 100644
--- a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
@@ -33,12 +33,12 @@ declare type AddressType as open {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/customer.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customer.adm"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql b/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
index 4918fd9..a4d27b1 100644
--- a/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
@@ -33,12 +33,12 @@ declare type AddressType as open {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/02-filter-cust.adm";
+write output to asterix_nc1:"/tmp/02-filter-cust.adm";
 
 for $c in dataset('Customers')
 where $c.age < 21 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql b/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
index 718490f..9ba6702 100644
--- a/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
@@ -33,12 +33,12 @@ declare type AddressType as open {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
-write output to nc1:"/tmp/03-count-cust-age.adm";
+write output to asterix_nc1:"/tmp/03-count-cust-age.adm";
 
 count(
 for $c in dataset('Customers')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
index a41d771..d20db92 100644
--- a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
@@ -27,11 +27,11 @@ declare type OrderType as open {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
 load dataset Orders 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orders.adm"),("format"="adm"));
+(("path"="asterix_nc1:///tmp/orders.adm"),("format"="adm"));

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql b/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
index 5720553..a2e5eb1 100644
--- a/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
@@ -27,12 +27,12 @@ declare type OrderType as open {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-write output to nc1:"/tmp/05-count-param1.adm";
+write output to asterix_nc1:"/tmp/05-count-param1.adm";
 
 count(
 for $o in dataset('Orders')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql b/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
index 595f5c9..e72a79d 100644
--- a/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
@@ -43,14 +43,14 @@ declare type OrderType as open {
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-write output to nc1:"/tmp/06-count-custord.adm";
+write output to asterix_nc1:"/tmp/06-count-custord.adm";
 
 for $c in dataset('Customers')
 for $o in dataset('Orders')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
index 6c52ed6..c810f14 100644
--- a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
@@ -26,11 +26,11 @@ declare type DBLPType as open {
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
  primary key id on group1;
 
 load dataset DBLP 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));
+(("path"="asterix_nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql b/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
index 2411f6d..1d7a2ca 100644
--- a/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
  primary key id on group1;
 
-write output to nc1:"/tmp/102-fuzzy-select.adm";
+write output to asterix_nc1:"/tmp/102-fuzzy-select.adm";
 
 for $x in dataset('DBLP')
 let $ed := edit-distance($x.authors, "Michael Carey")

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql b/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
index 28aa6f0..df6f75a 100644
--- a/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/110-self-join-dblp.adm";
+write output to asterix_nc1:"/tmp/110-self-join-dblp.adm";
 
 set simthreshold '.5f';
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql b/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
index b301b4f..e3baaea 100644
--- a/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
+++ b/asterix-app/src/test/resources/dmlts/scripts/enlist-scan-cust.aql
@@ -39,14 +39,14 @@ create type CustomerType as open {
 }
 
 
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
   primary key cid on group1;
 
 enlist dataset Customers;
 
-write output to nc1:"dmltest/enlist-scan-cust.adm";
+write output to asterix_nc1:"dmltest/enlist-scan-cust.adm";
 
 for $c in dataset('Customers')
 order by $c.cid

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql b/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
index 1169b4e..f5ec9c0 100644
--- a/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
+++ b/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
@@ -39,11 +39,11 @@ create type CustomerType as open {
 }
 
 
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/custord-tiny/customer-tiny.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://data/custord-tiny/customer-tiny.adm"),("format"="adm")) pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
index 2bb7ee1..28274bb 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
@@ -26,13 +26,13 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSXSmall(CSXType)
   primary key id on group1;
 
 load dataset CSXSmall
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/fuzzyjoin/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
+(("path"="asterix_nc1://data/fuzzyjoin/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
index 2a863b3..8cbad2d 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
@@ -26,13 +26,13 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType) 
   primary key id on group1;
 
 load dataset CSX 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/fuzzyjoin/pub/csx-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
+(("path"="asterix_nc1://data/fuzzyjoin/pub/csx-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
index 7e6a265..0d2fb35 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
@@ -26,13 +26,13 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1; 
+declare nodegroup group1 on asterix_nc1; 
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
 load dataset DBLP 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/fuzzyjoin/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
+(("path"="asterix_nc1://data/fuzzyjoin/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
index a2750c5..0f3cfe1 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/20-drop-dblp.aql
@@ -26,7 +26,7 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
index b04e88f..64b9e35 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/30-filter-dblp.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/amerix.adm";
+write output to asterix_nc1:"/tmp/amerix.adm";
 
 for $dblp in dataset('DBLP')
 where $dblp.id = 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
index 3f91a16..add0e93 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/40-self-join-dblp.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1; 
+declare nodegroup group1 on asterix_nc1; 
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/amerix.adm";
+write output to asterix_nc1:"/tmp/amerix.adm";
 
 //
 // -- - Stage 3 - --

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
index a7921b2..191bd61 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/50-self-join-dblp.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/amerix.adm";
+write output to asterix_nc1:"/tmp/amerix.adm";
 
 for   $paperR in dataset('DBLP')
 for   $paperS in dataset('DBLP')

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
index 2dd11ef..450ef16 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/000-1-char-at.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/dblp.adm";
+write output to asterix_nc1:"/tmp/dblp.adm";
 
 for $paperR in dataset('DBLP')
 where $paperR.id = 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
index 173854f..8113b6f 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
 load dataset DBLP 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/dblp-small/dblp-small-id.txt"),("format"="delimited-text"),("delimiter=":")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/dblp-small/dblp-small-id.txt"),("format"="delimited-text"),("delimiter=":")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
index da497f0..407f455 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/020-drop.aql
@@ -26,7 +26,7 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
index 7167199..b601756 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/030-filter.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/dblp.adm';
+write output to asterix_nc1:'/tmp/dblp.adm';
 
 for $paper in dataset('DBLP')
 where $paper.id = 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
index f418921..68af44c 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/040-self-join-aql.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/dblp.adm';
+write output to asterix_nc1:'/tmp/dblp.adm';
 
 //
 // -- - Stage 3 - --

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
index 47d8af6..d6a5ff6 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/050-self-join-op.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/dblp.adm';
+write output to asterix_nc1:'/tmp/dblp.adm';
 
 set simthreshold '.5';
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
index 5f81540..6e0dd91 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
@@ -26,13 +26,13 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-// load dataset DBLP from nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
+// load dataset DBLP from asterix_nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
 load dataset DBLP 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///fuzzyjoin/data/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
+(("path"="asterix_nc1:///fuzzyjoin/data/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
index da497f0..407f455 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/020-drop-dblp.aql
@@ -26,7 +26,7 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
index e69e7bf..3dea415 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/030-filter-dblp.aql
@@ -26,12 +26,12 @@ declare type DBLPType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/pub.adm';
+write output to asterix_nc1:'/tmp/pub.adm';
 
 for $paper in dataset('DBLP')
 // where $paper.id = 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
index 6898f5d..48a9a3c 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
@@ -26,13 +26,13 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType)
   primary key id on group1;
 
-// load dataset CSX from nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
+// load dataset CSX from asterix_nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
 load dataset  CSX
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
index 2d92f4c..03c0b00 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/050-drop-csx.aql
@@ -26,7 +26,7 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType) 
   primary key id on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
index 926c9d1..bbe1ad9 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/060-filter-csx.aql
@@ -28,12 +28,12 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset CSX(CSXType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/pub.adm';
+write output to asterix_nc1:'/tmp/pub.adm';
 
 for $paper in dataset('CSX')
 // where $paper.id = 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
index 903162d..c49131b 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/070-join-aql.aql
@@ -34,7 +34,7 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
@@ -42,7 +42,7 @@ declare dataset DBLP(DBLPType)
 declare dataset CSX(CSXType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/pub.adm';
+write output to asterix_nc1:'/tmp/pub.adm';
 
 //
 // -- - Stage 3 - --

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
index 005ab8d..802accf 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/080-join-op.aql
@@ -34,7 +34,7 @@ declare type CSXType as open {
   misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
@@ -42,7 +42,7 @@ declare dataset DBLP(DBLPType)
 declare dataset CSX(CSXType) 
   primary key id on group1;
 
-write output to nc1:'/tmp/pub.adm';
+write output to asterix_nc1:'/tmp/pub.adm';
 
 set simthreshold '.5';
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
index 34ee680..7ec7194 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
@@ -25,12 +25,12 @@ declare type UserType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;
 
 load dataset Users 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
index fc4b2a4..4fd6787 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
@@ -25,7 +25,7 @@ declare type UserType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
index 3831c8c..a73db6e 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
@@ -25,12 +25,12 @@ declare type UserType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;
 
-write output to nc1:'/tmp/users.adm';
+write output to asterix_nc1:'/tmp/users.adm';
 
 for $u in dataset('Users')
 // where $u.uid > 1

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
index 0c53df3..d59aed9 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
@@ -25,13 +25,13 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;
 
 load dataset Visitors 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
index 48c62b3..7be4c8e 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
@@ -25,7 +25,7 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
index a54c00d..d5634e7 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
@@ -25,12 +25,12 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;
 
-write output to nc1:'/tmp/visitors.adm';
+write output to asterix_nc1:'/tmp/visitors.adm';
 
 for $v in dataset('Visitors')
 // where $v.vid >= 10

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
index 15c4e27..4cea4cf 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
@@ -32,14 +32,14 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;
 
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
 
 //
 // -- - Stage 3 - --

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
index 9c90fa9..c52bb2f 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
@@ -32,14 +32,14 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;
 
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
 
 set simthreshold '.5';
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
index 7167c3c..b1334c0 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
@@ -32,14 +32,14 @@ declare type VisitorType as open {
   interests: {{string}}
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) 
   primary key uid on group1;
 declare dataset Visitors(VisitorType) 
   primary key vid on group1;
 
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
 
 set simthreshold '.5';
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/integration/queries/dataset-scan.aql b/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
index 5e3318f..38262b9 100644
--- a/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
+++ b/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
@@ -35,7 +35,7 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/integration/queries/retrecord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/integration/queries/retrecord.aql b/asterix-app/src/test/resources/integration/queries/retrecord.aql
index 3636d8d..997eafd 100644
--- a/asterix-app/src/test/resources/integration/queries/retrecord.aql
+++ b/asterix-app/src/test/resources/integration/queries/retrecord.aql
@@ -19,8 +19,8 @@
 declare function samecust($cust, $ord)
 {$cust.cid = $ord.cid}
 
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['nc1', 'data/spj01/cust1.adm'], ['nc2', 'data/spj01/cust2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['nc1', 'data/spj01/ord1.adm'], ['nc2', 'data/spj01/ord2.adm'])
+for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
+for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
 where samecust($c, $o)
 return { "customer":$c, "order":$o } 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql b/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
index a18a66c..c599ffc 100644
--- a/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
+++ b/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-for $p in recordset(['pid', 'int32', 'oid', 'int32', 'value', 'float'], 'osfiles', ['nc1', 'data/spj01/payment1.adm'], ['nc2', 'data/spj01/payment2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['nc1', 'data/spj01/ord1.adm'], ['nc2', 'data/spj01/ord2.adm'])
+for $p in recordset(['pid', 'int32', 'oid', 'int32', 'value', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/payment1.adm'], ['asterix_nc2', 'data/spj01/payment2.adm'])
+for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
 where $o.oid = $p.oid and $o.total > $p.value
 return 
 { "order-id": $o.oid, "balance": $o.total - $p.value }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/integration/updates/load-dataset.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/integration/updates/load-dataset.aql b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
index 1cfed34..48bb41a 100644
--- a/asterix-app/src/test/resources/integration/updates/load-dataset.aql
+++ b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
@@ -30,11 +30,11 @@ declare type AddressType as closed {
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
index 87953a8..3f68ed8 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;
 
-write output to nc1:"rttest/check_dataset.adm";
+write output to asterix_nc1:"rttest/check_dataset.adm";
 
 for $c in dataset('Dataset')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
index 5d6e16d..64b8318 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;
 
-write output to nc1:"rttest/check_datatype.adm";
+write output to asterix_nc1:"rttest/check_datatype.adm";
      
 for $c in dataset('Datatype')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
index c7e7663..17eb021 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;
 
-write output to nc1:"rttest/check_dataverse.adm";
+write output to asterix_nc1:"rttest/check_dataverse.adm";
 
 for $c in dataset('Dataverse')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
index a672d57..1796f9f 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;
 
-write output to nc1:"rttest/check_index.adm";
+write output to asterix_nc1:"rttest/check_index.adm";
 
 for $c in dataset('Index')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
index 57a2569..bd42fa2 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;    
 
-write output to nc1:"rttest/check_node.adm";
+write output to asterix_nc1:"rttest/check_node.adm";
 
 for $c in dataset('Node')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
index 5841224..35cd7e0 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
@@ -18,7 +18,7 @@
  */
 use dataverse Metadata;
 
-write output to nc1:"rttest/check_nodegroup.adm";
+write output to asterix_nc1:"rttest/check_nodegroup.adm";
      
 for $c in dataset('Nodegroup')
 return $c

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql b/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
index 74650ac..50d5d13 100644
--- a/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
@@ -59,7 +59,7 @@ create type OrderType as open {
        } ]
 }
 
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
   primary key cid, name on group1;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
index 2b15b2c..a6b09b5 100644
--- a/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
@@ -18,4 +18,4 @@
  */
 use dataverse custord;
 
-create nodegroup group1 on nc1, nc2;
+create nodegroup group1 on asterix_nc1, asterix_nc2;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
index 672ca46..deaff04 100644
--- a/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
@@ -19,7 +19,7 @@
 use dataverse custord;
 
 // Creating this nodegroup should succeed.
-create nodegroup newgroup if not exists on nc1, nc2;
+create nodegroup newgroup if not exists on asterix_nc1, asterix_nc2;
 
 // Creating this duplicate type should fail, and rollback should remove the new nodegroup.
 create type StreetType as closed {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/queries/exception/issue_255_create_feed_error/issue_255_create_feed_error.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/queries/exception/issue_255_create_feed_error/issue_255_create_feed_error.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/exception/issue_255_create_feed_error/issue_255_create_feed_error.1.ddl.aql
index d8d2e93..5244af0 100644
--- a/asterix-app/src/test/resources/metadata/queries/exception/issue_255_create_feed_error/issue_255_create_feed_error.1.ddl.aql
+++ b/asterix-app/src/test/resources/metadata/queries/exception/issue_255_create_feed_error/issue_255_create_feed_error.1.ddl.aql
@@ -37,5 +37,5 @@ create type TweetType as closed {
 
 create feed dataset TweetFeed(TweetType)
 using "org.apache.asterix.tools.external.data.RateControlledFileSystemBasedAdapterFactory"
-(("output-type-name"="TweetType"),("fs"="localfs"),("path"="nc1://data/twitter/obamatweets.adm"),("format"="adm"),("tuple-interval"="10"))
+(("output-type-name"="TweetType"),("fs"="localfs"),("path"="asterix_nc1://data/twitter/obamatweets.adm"),("format"="adm"),("tuple-interval"="10"))
 primary key name;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
index 5ccb3f8..43f9417 100644
--- a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
+++ b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution.aql
@@ -52,12 +52,12 @@ create type CustomerType as closed {
              } ]
 }
 
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
   primary key cid, name on group1;
 
-create nodegroup group1 on nc1, nc2;
+create nodegroup group1 on asterix_nc1, asterix_nc2;
 
 // the following statement should not get executed 
 // as the above statement causes an exception

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
index 5ccb3f8..43f9417 100644
--- a/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
+++ b/asterix-app/src/test/resources/metadata/queries/transaction/failure_subsequent_no_execution/failure_subsequent_no_execution.1.ddl.aql
@@ -52,12 +52,12 @@ create type CustomerType as closed {
              } ]
 }
 
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
 
 create dataset Customers(CustomerType)
   primary key cid, name on group1;
 
-create nodegroup group1 on nc1, nc2;
+create nodegroup group1 on asterix_nc1, asterix_nc2;
 
 // the following statement should not get executed 
 // as the above statement causes an exception

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_previous_success.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_previous_success.aql b/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_previous_success.aql
index b4195d0..cb458ca 100644
--- a/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_previous_success.aql
+++ b/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_previous_success.aql
@@ -23,7 +23,7 @@
  */
 use dataverse custord;
 
-write output to nc1:"mdtest/transaction_verify_failure_previous_success.adm";
+write output to asterix_nc1:"mdtest/transaction_verify_failure_previous_success.adm";
 
 for $x in dataset('Metadata.Datatype')
 where $x.DataverseName='custord'

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_subsequent_no_execution.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_subsequent_no_execution.aql b/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_subsequent_no_execution.aql
index e9f1b3a..e4fc62a 100644
--- a/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_subsequent_no_execution.aql
+++ b/asterix-app/src/test/resources/metadata/queries/transaction/verify_failure_subsequent_no_execution.aql
@@ -24,7 +24,7 @@
 
 use dataverse custord;
 
-write output to nc1:"mdtest/transaction_verify_failure_subsequent_no_execution.adm";
+write output to asterix_nc1:"mdtest/transaction_verify_failure_subsequent_no_execution.adm";
 
 for $x in dataset('Metadata.Index')
 where $x.DataverseName='custord'

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta07.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta07.adm b/asterix-app/src/test/resources/metadata/results/basic/meta07.adm
index f0a6e1d..cd23eb0 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta07.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta07.adm
@@ -1,2 +1,2 @@
-{ "NodeName": "nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
-{ "NodeName": "nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta07/meta07.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta07/meta07.1.adm b/asterix-app/src/test/resources/metadata/results/basic/meta07/meta07.1.adm
index f0a6e1d..cd23eb0 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta07/meta07.1.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta07/meta07.1.adm
@@ -1,2 +1,2 @@
-{ "NodeName": "nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
-{ "NodeName": "nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta08.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta08.adm b/asterix-app/src/test/resources/metadata/results/basic/meta08.adm
index cadf1c4..fb590b3 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta08.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta08.adm
@@ -1,2 +1,2 @@
-{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "nc1", "nc2" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
-{ "GroupName": "MetadataGroup", "NodeNames": {{ "nc1" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
+{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "asterix_nc1", "asterix_nc2" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
+{ "GroupName": "MetadataGroup", "NodeNames": {{ "asterix_nc1" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta08/meta08.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta08/meta08.1.adm b/asterix-app/src/test/resources/metadata/results/basic/meta08/meta08.1.adm
index cadf1c4..fb590b3 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta08/meta08.1.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta08/meta08.1.adm
@@ -1,2 +1,2 @@
-{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "nc1", "nc2" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
-{ "GroupName": "MetadataGroup", "NodeNames": {{ "nc1" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
+{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "asterix_nc1", "asterix_nc2" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }
+{ "GroupName": "MetadataGroup", "NodeNames": {{ "asterix_nc1" }}, "Timestamp": "Mon Sep 17 12:31:45 PDT 2012" }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta20.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta20.adm b/asterix-app/src/test/resources/metadata/results/basic/meta20.adm
index f0a6e1d..cd23eb0 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta20.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta20.adm
@@ -1,2 +1,2 @@
-{ "NodeName": "nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
-{ "NodeName": "nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta20/meta20.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta20/meta20.1.adm b/asterix-app/src/test/resources/metadata/results/basic/meta20/meta20.1.adm
index f0a6e1d..cd23eb0 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta20/meta20.1.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta20/meta20.1.adm
@@ -1,2 +1,2 @@
-{ "NodeName": "nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
-{ "NodeName": "nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta21.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta21.adm b/asterix-app/src/test/resources/metadata/results/basic/meta21.adm
index d7e8460..bcf68bb 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta21.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta21.adm
@@ -1,2 +1,2 @@
-{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "nc1", "nc2" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
-{ "GroupName": "MetadataGroup", "NodeNames": {{ "nc1" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
+{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "asterix_nc1", "asterix_nc2" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
+{ "GroupName": "MetadataGroup", "NodeNames": {{ "asterix_nc1" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/meta21/meta21.1.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta21/meta21.1.adm b/asterix-app/src/test/resources/metadata/results/basic/meta21/meta21.1.adm
index d7e8460..bcf68bb 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/meta21/meta21.1.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/meta21/meta21.1.adm
@@ -1,2 +1,2 @@
-{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "nc1", "nc2" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
-{ "GroupName": "MetadataGroup", "NodeNames": {{ "nc1" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
+{ "GroupName": "DEFAULT_NG_ALL_NODES", "NodeNames": {{ "asterix_nc1", "asterix_nc2" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }
+{ "GroupName": "MetadataGroup", "NodeNames": {{ "asterix_nc1" }}, "Timestamp": "Thu Sep 13 11:42:20 PDT 2012" }

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f7b64538/asterix-app/src/test/resources/metadata/results/basic/metadata_node.adm
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/metadata/results/basic/metadata_node.adm b/asterix-app/src/test/resources/metadata/results/basic/metadata_node.adm
index f0a6e1d..cd23eb0 100644
--- a/asterix-app/src/test/resources/metadata/results/basic/metadata_node.adm
+++ b/asterix-app/src/test/resources/metadata/results/basic/metadata_node.adm
@@ -1,2 +1,2 @@
-{ "NodeName": "nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
-{ "NodeName": "nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc1", "NumberOfCores": 0, "WorkingMemorySize": 0 }
+{ "NodeName": "asterix_nc2", "NumberOfCores": 0, "WorkingMemorySize": 0 }



Mime
View raw message