Fuseメモリモード、okuyamaモードFix
trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFilesystem.java (diff) trunk/okuyamaFuse/src/fuse/okuyamafs/CoreMapFactory.java (diff) trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFsMap.java (diff)| @@ -24,7 +24,7 @@ | ||
| 24 | 24 | |
| 25 | 25 | public volatile static int blockSizeAssist = 50; |
| 26 | 26 | |
| 27 | - public volatile static int blockSize = 1024*128;//5200; // Blockサイズ | |
| 27 | + public volatile static int blockSize = 1024*16;//5200; // Blockサイズ | |
| 28 | 28 | //public volatile static int blockSize = 5632; // Blockサイズ |
| 29 | 29 | |
| 30 | 30 |
| @@ -45,8 +45,8 @@ | ||
| 45 | 45 | if (CoreMapFactory.factoryType == 1) { |
| 46 | 46 | return new NativeFsMap(1, (String[])parameterMap.get("okuyamainfo")); |
| 47 | 47 | } else if(CoreMapFactory.factoryType == 2) { |
| 48 | -// return new NativeFsMap(1); | |
| 49 | - return new OkuyamaFsMap(1, (String[])parameterMap.get("okuyamainfo")); | |
| 48 | + //return new OkuyamaFsMap(1, (String[])parameterMap.get("okuyamainfo")); // | |
| 49 | + return new MemoryBufferedFsMap(1, (String[])parameterMap.get("okuyamainfo")); | |
| 50 | 50 | } else if (CoreMapFactory.factoryType == 3) { |
| 51 | 51 | return new LocalCacheOkuyamaFsMap(1, (String[])parameterMap.get("okuyamainfo")); |
| 52 | 52 | } |
| @@ -58,9 +58,9 @@ | ||
| 58 | 58 | if (CoreMapFactory.factoryType == 1) { |
| 59 | 59 | return new NativeFsMap(2, (String[])parameterMap.get("okuyamainfo")); |
| 60 | 60 | } else if(CoreMapFactory.factoryType == 2) { |
| 61 | - | |
| 62 | - //return new NativeFsMap(2, (String[])parameterMap.get("okuyamainfo")); | |
| 63 | - return new OkuyamaFsMap(2, (String[])parameterMap.get("okuyamainfo")); | |
| 61 | + //return new OkuyamaFsMap(2, (String[])parameterMap.get("okuyamainfo")); | |
| 62 | + return new MemoryBufferedFsMap(2, (String[])parameterMap.get("okuyamainfo")); | |
| 63 | + | |
| 64 | 64 | } else if (CoreMapFactory.factoryType == 3) { |
| 65 | 65 | return new LocalCacheOkuyamaFsMap(2, (String[])parameterMap.get("okuyamainfo")); |
| 66 | 66 | } |
| @@ -72,7 +72,8 @@ | ||
| 72 | 72 | if (CoreMapFactory.factoryType == 1) { |
| 73 | 73 | return new NativeFsMap(3, (String[])parameterMap.get("okuyamainfo")); |
| 74 | 74 | } else if(CoreMapFactory.factoryType == 2) { |
| 75 | - return new OkuyamaFsMap(3, (String[])parameterMap.get("okuyamainfo")); | |
| 75 | + //return new OkuyamaFsMap(3, (String[])parameterMap.get("okuyamainfo")); | |
| 76 | + return new MemoryBufferedFsMap(3, (String[])parameterMap.get("okuyamainfo")); | |
| 76 | 77 | } else if (CoreMapFactory.factoryType == 3) { |
| 77 | 78 | return new LocalCacheOkuyamaFsMap(3, (String[])parameterMap.get("okuyamainfo")); |
| 78 | 79 | } |
| @@ -57,6 +57,9 @@ | ||
| 57 | 57 | /** |
| 58 | 58 | * コンストラクタ |
| 59 | 59 | */ |
| 60 | + public OkuyamaFsMap() { | |
| 61 | + } | |
| 62 | + | |
| 60 | 63 | public OkuyamaFsMap(int type, String[] masterNodeInfos) { |
| 61 | 64 | this.type = type; |
| 62 | 65 | this.masterNodeList = masterNodeInfos; |
| @@ -206,8 +209,6 @@ | ||
| 206 | 209 | } |
| 207 | 210 | |
| 208 | 211 | public Object putMultiBytes(Object[] dataList) { |
| 209 | - | |
| 210 | - | |
| 211 | 212 | try { |
| 212 | 213 | List useDaemonList = new ArrayList(); |
| 213 | 214 | //long start = System.nanoTime(); |
Fork