# IGNITE-226: WIP.

modules/core/src/main/java/org/apache/ignite/IgniteFs.java

@@ -58,7 +58,7 @@
  */
 public interface IgniteFs extends Igfs, IgniteAsyncSupport {
     /** GGFS scheme name. */
-    public static final String GGFS_SCHEME = "ggfs";
+    public static final String IGFS_SCHEME = "igfs";
 
     /** File property: prefer writes to local node. */
     public static final String PROP_PREFER_LOCAL_WRITES = "locWrite";

modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java

@@ -58,7 +58,7 @@ public class IgfsConfiguration {
     public static final int DFLT_GGFS_LOG_BATCH_SIZE = 100;
 
     /** Default {@code GGFS} log directory. */
-    public static final String DFLT_GGFS_LOG_DIR = "work/ggfs/log";
+    public static final String DFLT_GGFS_LOG_DIR = "work/igfs/log";
 
     /** Default per node buffer size. */
     public static final int DFLT_PER_NODE_BATCH_SIZE = 100;

modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java

@@ -28,7 +28,7 @@
  *     GridGgfsPath filePath = new GridGgfsPath("my/working/dir", "file.txt");
  *
  *     // Get metadata about file.
- *     GridGgfsFile file = ggfs.info(filePath);
+ *     GridGgfsFile file = igfs.info(filePath);
  * </pre>
  */
 public interface IgfsFile {

modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java

@@ -34,7 +34,7 @@
  *     GridGgfsPath filePath = new GridGgfsPath(dirPath, "file.txt");
  *
  *     // Get metadata about file.
- *     GridGgfsFile file = ggfs.info(filePath);
+ *     GridGgfsFile file = igfs.info(filePath);
  * </pre>
  */
 public final class IgfsPath implements Comparable<IgfsPath>, Externalizable {

modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java

@@ -64,7 +64,7 @@ public final class IgniteNodeAttributes {
     public static final String ATTR_TX_CONFIG = ATTR_PREFIX + ".tx";
 
     /** Internal attribute name constant. */
-    public static final String ATTR_GGFS = ATTR_PREFIX + ".ggfs";
+    public static final String ATTR_GGFS = ATTR_PREFIX + ".igfs";
 
     /** Internal attribute name constant. */
     public static final String ATTR_MONGO = ATTR_PREFIX + ".mongo";

modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java

@@ -1501,9 +1501,9 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException {
                 0,
                 new LinkedBlockingQueue<Runnable>());
 
-            // Note that we do not pre-start threads here as ggfs pool may not be needed.
+            // Note that we do not pre-start threads here as igfs pool may not be needed.
             ggfsExecSvc = new IgniteThreadPoolExecutor(
-                "ggfs-" + cfg.getGridName(),
+                "igfs-" + cfg.getGridName(),
                 cfg.getGgfsThreadPoolSize(),
                 cfg.getGgfsThreadPoolSize(),
                 0,

modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java

@@ -220,7 +220,7 @@ private IgfsLogger(String endpoint, String ggfsName, String dir, int batchSize)
         A.ensure(dirFile.isDirectory(), "dir must point to a directory");
         A.ensure(dirFile.exists(), "dir must exist");
 
-        file = new File(dirFile, "ggfs-log-" + ggfsName + "-" + pid + ".csv");
+        file = new File(dirFile, "igfs-log-" + ggfsName + "-" + pid + ".csv");
 
         entries = new ConcurrentLinkedDeque8<>();
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java

@@ -4750,7 +4750,7 @@ protected Object readResolve() throws ObjectStreamException {
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
+    @Override public long igfsDataSpaceUsed() {
         assert ggfsDataCache;
 
         return ggfsDataCacheSize.longValue();

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java

@@ -195,7 +195,7 @@ protected void value(@Nullable V val, @Nullable byte[] valBytes) {
         assert Thread.holdsLock(this);
 
         // In case we deal with GGFS cache, count updated data
-        if (cctx.cache().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isGgfsBlockKey(key())) {
+        if (cctx.cache().isGgfsDataCache() && cctx.kernalContext().ggfsHelper().isIgfsBlockKey(key())) {
             int newSize = valueLength((byte[])val, valBytes != null ? GridCacheValueBytes.marshaled(valBytes) :
                 GridCacheValueBytes.nil());
             int oldSize = valueLength((byte[])this.val, this.val == null ? valueBytesUnlocked() :

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java

@@ -344,7 +344,7 @@ public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntr
      *
      * @return Amount of used GGFS space in bytes.
      */
-    public long ggfsDataSpaceUsed();
+    public long igfsDataSpaceUsed();
 
     /**
      * Get maximum space available for GGFS.

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java

@@ -713,8 +713,8 @@ private IgnitePredicate<Cache.Entry<K, V>> visitor(final IgnitePredicate<Cache.E
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
-        return cache.ggfsDataSpaceUsed();
+    @Override public long igfsDataSpaceUsed() {
+        return cache.igfsDataSpaceUsed();
     }
 
     /** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java

@@ -565,11 +565,11 @@ public GridCacheProjectionImpl<K, V> gateProjection() {
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
+    @Override public long igfsDataSpaceUsed() {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.ggfsDataSpaceUsed();
+            return delegate.igfsDataSpaceUsed();
         }
         finally {
             gate.leave(prev);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java

@@ -493,7 +493,7 @@ private boolean preloadEntry(ClusterNode pick, int p, GridCacheEntryInfo<K, V> e
                         log.debug("Preloading key [key=" + entry.key() + ", part=" + p + ", node=" + pick.id() + ']');
 
                     if (cctx.dht().isGgfsDataCache() &&
-                        cctx.dht().ggfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) {
+                        cctx.dht().igfsDataSpaceUsed() > cctx.dht().ggfsDataSpaceMax()) {
                         LT.error(log, null, "Failed to preload GGFS data cache (GGFS space size exceeded maximum " +
                             "value, will ignore preload entries): " + name());
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java

@@ -633,8 +633,8 @@ public boolean clearLocally0(K key, @Nullable IgnitePredicate<Cache.Entry<K, V>>
     }
 
     /** {@inheritDoc} */
-    @Override public long ggfsDataSpaceUsed() {
-        return dht().ggfsDataSpaceUsed();
+    @Override public long igfsDataSpaceUsed() {
+        return dht().igfsDataSpaceUsed();
     }
 
     /** {@inheritDoc} */

modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java

@@ -712,7 +712,7 @@ private String poolName(GridClosurePolicy plc) {
                 return "system";
 
             case GGFS_POOL:
-                return "ggfs";
+                return "igfs";
 
             default:
                 throw new IllegalArgumentException("Invalid closure execution policy: " + plc);