ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [13/16] ignite git commit: Now getting rid of listing2 (1).
Date Tue, 15 Mar 2016 13:35:22 GMT
Now getting rid of listing2 (1).


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8cabfcdb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8cabfcdb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8cabfcdb

Branch: refs/heads/ignite-2813
Commit: 8cabfcdb95d483309825cd3641738a805282f275
Parents: 2985289
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Mar 15 16:20:17 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Mar 15 16:20:17 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/igfs/IgfsMetaManager.java       | 12 ++++++------
 .../internal/processors/igfs/IgfsProcessorSelfTest.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8cabfcdb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 59874fb..7a3c108 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -1425,10 +1425,10 @@ public class IgfsMetaManager extends IgfsManager {
 
                         assert parentInfo != null;
 
-                        IgniteUuid childId = parentInfo.listing2().get(name);
+                        IgfsListingEntry childEntry = parentInfo.listing().get(name);
 
-                        if (childId != null)
-                            id2InfoPrj.invoke(parentId, new ListingRemove(name, childId));
+                        if (childEntry != null)
+                            id2InfoPrj.invoke(parentId, new ListingRemove(name, childEntry.fileId()));
 
                         IgfsFileInfo deleted = id2InfoPrj.getAndRemove(id);
 
@@ -1471,8 +1471,8 @@ public class IgfsMetaManager extends IgfsManager {
                     IgfsFileInfo trashInfo = id2InfoPrj.get(trashId);
 
                     if (trashInfo != null && trashInfo.hasChildren()) {
-                        for (IgniteUuid entry : trashInfo.listing2().values())
-                            ids.add(entry);
+                        for (IgfsListingEntry entry : trashInfo.listing().values())
+                            ids.add(entry.fileId());
                     }
                 }
 
@@ -1990,7 +1990,7 @@ public class IgfsMetaManager extends IgfsManager {
                                 id2InfoPrj.put(newInfo.id(), newInfo); // Put the new one.
 
                                 id2InfoPrj.invoke(parentInfo.id(),
-                                    new ListingRemove(path.name(), parentInfo.listing2().get(path.name())));
+                                    new ListingRemove(path.name(), parentInfo.listing().get(path.name()).fileId()));
                                 id2InfoPrj.invoke(parentInfo.id(),
                                     new ListingAdd(path.name(), new IgfsListingEntry(newInfo)));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/8cabfcdb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index 79d337b..f567099 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -231,7 +231,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
                     (IgfsFileInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(),
ONHEAP_PEEK_MODES, null);
 
                 assertNotNull(fileInfo);
-                assertNotNull(fileInfo.listing2());
+                assertNotNull(fileInfo.listing());
             }
         }
         finally {


Mime
View raw message