ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [3/4] ignite git commit: Merge branch 'master' into ignite-2806
Date Mon, 21 Mar 2016 05:56:13 GMT
Merge branch 'master' into ignite-2806


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

Branch: refs/heads/ignite-2806
Commit: b9ff6bfdce1bf4b8a5c925b266dc788e16f63e02
Parents: e57284b 865e376
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Mar 21 08:54:38 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Mar 21 08:54:38 2016 +0300

----------------------------------------------------------------------
 .../igfs/IgfsFragmentizerManager.java           |  141 +--
 .../processors/igfs/IgfsMetaManager.java        | 1142 ++----------------
 .../internal/processors/igfs/IgfsPathIds.java   |    2 +-
 .../meta/IgfsMetaDirectoryCreateProcessor.java  |  117 ++
 .../IgfsMetaDirectoryListingAddProcessor.java   |   92 ++
 ...IgfsMetaDirectoryListingRemoveProcessor.java |   89 ++
 ...gfsMetaDirectoryListingReplaceProcessor.java |   84 ++
 .../igfs/meta/IgfsMetaFileCreateProcessor.java  |  110 ++
 .../igfs/meta/IgfsMetaFileLockProcessor.java    |   63 +
 .../meta/IgfsMetaFileRangeDeleteProcessor.java  |   74 ++
 .../meta/IgfsMetaFileRangeUpdateProcessor.java  |   81 ++
 .../meta/IgfsMetaFileReserveSpaceProcessor.java |   75 ++
 .../igfs/meta/IgfsMetaFileUnlockProcessor.java  |   60 +
 .../igfs/meta/IgfsMetaUpdatePathProcessor.java  |   66 +
 .../meta/IgfsMetaUpdatePropertiesProcessor.java |   78 ++
 .../igfs/meta/IgfsMetaUpdateTimesProcessor.java |   68 ++
 16 files changed, 1155 insertions(+), 1187 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b9ff6bfd/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 283a113,1aa49ed..a3aef4a
--- 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
@@@ -907,12 -891,10 +903,10 @@@ public class IgfsMetaManager extends Ig
                  // Lock participating IDs.
                  final Set<IgniteUuid> lockIds = new TreeSet<>(PATH_ID_SORTING_COMPARATOR);
  
 -                srcPathIds.addExistingIds(lockIds);
 -                dstPathIds.addExistingIds(lockIds);
 +                srcPathIds.addExistingIds(lockIds, relaxed);
 +                dstPathIds.addExistingIds(lockIds, relaxed);
  
-                 IgniteInternalTx tx = startTx();
- 
-                 try {
+                 try (IgniteInternalTx tx = startTx()) {
                      // Obtain the locks.
                      final Map<IgniteUuid, IgfsEntryInfo> lockInfos = lockIds(lockIds);
  
@@@ -1685,16 -1593,16 +1605,14 @@@
                      // Prepare lock IDs. Essentially, they consist of two parts: existing
IDs and potential new IDs.
                      Set<IgniteUuid> lockIds = new TreeSet<>(PATH_ID_SORTING_COMPARATOR);
  
 -                    pathIds.addExistingIds(lockIds);
 +                    pathIds.addExistingIds(lockIds, relaxed);
                      pathIds.addSurrogateIds(lockIds);
  
 -                    assert lockIds.size() == pathIds.count();
 -
                      // Start TX.
-                     IgniteInternalTx tx = startTx();
- 
-                     try {
+                     try (IgniteInternalTx tx = startTx()) {
                          final Map<IgniteUuid, IgfsEntryInfo> lockInfos = lockIds(lockIds);
  
 -                        if (!pathIds.verifyIntegrity(lockInfos))
 +                        if (!pathIds.verifyIntegrity(lockInfos, relaxed))
                              // Directory structure changed concurrently. So we simply re-try.
                              continue;
  
@@@ -3419,12 -2932,10 +2942,10 @@@
                      pathIds.addSurrogateIds(lockIds);
  
                      // Start TX.
-                     IgniteInternalTx tx = startTx();
- 
-                     try {
+                     try (IgniteInternalTx tx = startTx()) {
                          Map<IgniteUuid, IgfsEntryInfo> lockInfos = lockIds(lockIds);
  
 -                        if (!pathIds.verifyIntegrity(lockInfos))
 +                        if (!pathIds.verifyIntegrity(lockInfos, relaxed))
                              // Directory structure changed concurrently. So we simply re-try.
                              continue;
  
@@@ -3528,12 -3037,10 +3047,10 @@@
                      }
  
                      // Start TX.
-                     IgniteInternalTx tx = startTx();
- 
-                     try {
+                     try (IgniteInternalTx tx = startTx()) {
                          Map<IgniteUuid, IgfsEntryInfo> lockInfos = lockIds(lockIds);
  
 -                        if (!pathIds.verifyIntegrity(lockInfos))
 +                        if (!pathIds.verifyIntegrity(lockInfos, relaxed))
                              // Directory structure changed concurrently. So we simply re-try.
                              continue;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/b9ff6bfd/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsPathIds.java
----------------------------------------------------------------------


Mime
View raw message