ignore rootfs in sys.nodes.fs

crate · Nov 13, 2014 · 20dd295 · 20dd295
1 parent 375e733
commit 20dd295
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes for Crate
 Unreleased
 ==========
 
+ - Fix: do not consider rootfs on linux in ``sys.nodes.fs``
+
  - Added Support for Column Policies, which can be used to define
    if a table enforces its defined schema or if it's allowed
    to store additional columns which are not defined in the schema.

diff --git a/sql/src/main/java/io/crate/operation/reference/sys/node/fs/FileSystems.java b/sql/src/main/java/io/crate/operation/reference/sys/node/fs/FileSystems.java
@@ -30,13 +30,13 @@
 
 public class FileSystems {
 
-    private final static IntSet supportedFSTypes = IntOpenHashSet.from(
-            FileSystem.TYPE_LOCAL_DISK, FileSystem.TYPE_NETWORK, FileSystem.TYPE_RAM_DISK);
+    private final static IntSet SUPPORTED_FS_TYPES = IntOpenHashSet.from(
+            FileSystem.TYPE_LOCAL_DISK, FileSystem.TYPE_NETWORK);
 
     public final static Predicate<FileSystem> SUPPORTED_FS_TYPE = new Predicate<FileSystem>() {
         @Override
         public boolean apply(@Nullable FileSystem input) {
-            return (input != null && supportedFSTypes.contains(input.getType()));
+            return (input != null && SUPPORTED_FS_TYPES.contains(input.getType()));
         }
     };
 }
diff --git a/sql/src/main/java/io/crate/operation/reference/sys/node/fs/NodeFsDisksExpression.java b/sql/src/main/java/io/crate/operation/reference/sys/node/fs/NodeFsDisksExpression.java
@@ -57,7 +57,7 @@ protected List<SysObjectReference> getChildImplementations() {
                 FileSystem[] fileSystems = sigarService.sigar().getFileSystemList();
                 diskRefs = new ArrayList<>(fileSystems.length);
                 for (FileSystem fs : fileSystems) {
-                    if (! FileSystems.SUPPORTED_FS_TYPE.apply(fs)) {
+                    if (!FileSystems.SUPPORTED_FS_TYPE.apply(fs)) {
                         continue;
                     }
                     try {