final merge for numeric and string functions..im done..thank god
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@522 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 83e9991..541edd0 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -22,7 +22,6 @@
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
- public static final int FRAME_SIZE = 32768;
private static ClusterControllerService cc;
private static NodeControllerService nc1;
@@ -46,7 +45,6 @@
ncConfig1.clusterNetIPAddress = "127.0.0.1";
ncConfig1.dataIPAddress = "127.0.0.1";
ncConfig1.nodeId = NC1_ID;
- ncConfig1.frameSize = FRAME_SIZE;
nc1 = new NodeControllerService(ncConfig1);
nc1.start();
@@ -56,7 +54,6 @@
ncConfig2.clusterNetIPAddress = "127.0.0.1";
ncConfig2.dataIPAddress = "127.0.0.1";
ncConfig2.nodeId = NC2_ID;
- ncConfig2.frameSize = FRAME_SIZE;
nc2 = new NodeControllerService(ncConfig2);
nc2.start();
diff --git a/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/AsterixAppRuntimeContext.java b/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/AsterixAppRuntimeContext.java
index 36e8a4c..d676cb5 100644
--- a/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/AsterixAppRuntimeContext.java
+++ b/asterix-common/src/main/java/edu/uci/ics/asterix/common/context/AsterixAppRuntimeContext.java
@@ -20,6 +20,7 @@
import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
public class AsterixAppRuntimeContext {
+ private static final int DEFAULT_BUFFER_CACHE_PAGE_SIZE = 32768;
private final INCApplicationContext ncApplicationContext;
private IndexRegistry<IIndex> indexRegistry;
@@ -52,7 +53,7 @@
}
private int getBufferCachePageSize() {
- int pageSize = ncApplicationContext.getRootContext().getFrameSize();
+ int pageSize = DEFAULT_BUFFER_CACHE_PAGE_SIZE;
String pageSizeStr = System.getProperty(GlobalConfig.BUFFER_CACHE_PAGE_SIZE_PROPERTY, null);
if (pageSizeStr != null) {
try {