[2/2] ignite git commit: Done.

2018-11-28 Thread vozerov 
Done.


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

Branch: refs/heads/ignite-10435
Commit: 0379f945cbd5c095d9cfb84ac01f9a0d97334f4f
Parents: 8d2f8ba
Author: devozerov 
Authored: Wed Nov 28 11:42:54 2018 +0300
Committer: devozerov 
Committed: Wed Nov 28 11:42:54 2018 +0300

--
 .../platform/client/ClientRequest.java   | 19 ---
 ...lientCacheCreateWithConfigurationRequest.java |  7 +++
 ...CacheGetOrCreateWithConfigurationRequest.java |  4 +---
 3 files changed, 4 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
index 3e4bf06..76823b5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java
@@ -19,8 +19,6 @@ package org.apache.ignite.internal.processors.platform.client;
 
 import org.apache.ignite.binary.BinaryRawReader;
 import org.apache.ignite.internal.processors.odbc.ClientListenerRequest;
-import org.apache.ignite.plugin.security.SecurityException;
-import org.apache.ignite.plugin.security.SecurityPermission;
 
 /**
  * Thin client request.
@@ -60,21 +58,4 @@ public class ClientRequest implements ClientListenerRequest {
 public ClientResponse process(ClientConnectionContext ctx) {
 return new ClientResponse(reqId);
 }
-
-/**
- * Run the code with converting {@link SecurityException} to {@link 
IgniteClientException}.
- */
-// TODO
-protected static void runWithSecurityExceptionHandler(Runnable runnable) {
-try {
-runnable.run();
-}
-catch (SecurityException ex) {
-throw new IgniteClientException(
-ClientStatus.SECURITY_VIOLATION,
-"Client is not authorized to perform this operation",
-ex
-);
-}
-}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
index 3683cfe..93a18ed 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheCreateWithConfigurationRequest.java
@@ -26,7 +26,6 @@ import 
org.apache.ignite.internal.processors.platform.client.ClientRequest;
 import org.apache.ignite.internal.processors.platform.client.ClientResponse;
 import org.apache.ignite.internal.processors.platform.client.ClientStatus;
 import 
org.apache.ignite.internal.processors.platform.client.IgniteClientException;
-import org.apache.ignite.plugin.security.SecurityPermission;
 
 /**
  * Cache create with configuration request.
@@ -51,9 +50,9 @@ public class ClientCacheCreateWithConfigurationRequest 
extends ClientRequest {
 /** {@inheritDoc} */
 @Override public ClientResponse process(ClientConnectionContext ctx) {
 try {
-// Use security exception handler since the code authorizes 
"enable on-heap cache" permission
-runWithSecurityExceptionHandler(() -> 
ctx.kernalContext().grid().createCache(cacheCfg));
-} catch (CacheExistsException e) {
+ctx.kernalContext().grid().createCache(cacheCfg);
+}
+catch (CacheExistsException e) {
 throw new IgniteClientException(ClientStatus.CACHE_EXISTS, 
e.getMessage());
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0379f945/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheGetOrCreateWithConfigurationRequest.java
--
diff --git

[2/2] ignite git commit: Done.

2016-03-04 Thread vozerov 
Done.


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

Branch: refs/heads/igfs-optimistic
Commit: 772391767892b1a64026dcffe9c894fc09c44233
Parents: 95f0c84
Author: vozerov-gridgain 
Authored: Fri Mar 4 13:44:20 2016 +0300
Committer: vozerov-gridgain 
Committed: Fri Mar 4 13:44:20 2016 +0300

--
 .../processors/igfs/IgfsMetaManager.java| 1304 ++
 .../processors/igfs/IgfsAbstractSelfTest.java   |2 +-
 2 files changed, 716 insertions(+), 590 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/77239176/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 c120b9d..7811956 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
@@ -72,6 +72,7 @@ import 
org.apache.ignite.internal.processors.cache.GridCacheInternal;
 import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
 import org.apache.ignite.internal.processors.task.GridInternal;
+import 
org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
 import org.apache.ignite.internal.util.GridLeanMap;
 import org.apache.ignite.internal.util.GridSpinBusyLock;
 import org.apache.ignite.internal.util.lang.GridClosureException;
@@ -84,6 +85,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.lang.IgniteClosure;
 import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.transactions.TransactionOptimisticException;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
@@ -94,8 +96,10 @@ import static 
org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_WRITE;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.ROOT_ID;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.TRASH_ID;
 import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.builder;
+import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
 import static 
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
 import static 
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
 
 /**
  * Cache based structure (meta data) manager.
@@ -328,7 +332,7 @@ public class IgfsMetaManager extends IgfsManager {
 public List fileIds(IgfsPath path) throws 
IgniteCheckedException {
 if (busyLock.enterBusy()) {
 try {
-assert validTxState(false);
+//assert validTxState(false);
 
 return fileIds(path, false);
 }
@@ -481,35 +485,40 @@ public class IgfsMetaManager extends IgfsManager {
 assert validTxState(false);
 assert fileId != null;
 
-IgniteInternalTx tx = startTx();
+while (true) {
+IgniteInternalTx tx = startTx2();
 
-try {
-// Lock file ID for this transaction.
-IgfsFileInfo oldInfo = info(fileId);
+try {
+// Lock file ID for this transaction.
+IgfsFileInfo oldInfo = info(fileId);
 
-if (oldInfo == null)
-return null;
+if (oldInfo == null)
+return null;
 
-if (oldInfo.lockId() != null)
-return null; // The file is already locked, we cannot 
lock it.
+if (oldInfo.lockId() != null)
+return null; // The file is already locked, we 
cannot lock it.
 
-IgfsFileInfo newInfo = lockInfo(oldInfo, isDeleteLock);
+IgfsFileInfo newInfo = lockInfo(oldInfo, isDeleteLock);
 
-boolean put = id2InfoPrj.replace(fileId, oldInfo, newInfo);
+boolean put = id2InfoPrj.replace(fileId, oldInfo, 
newInfo);
 
-assert put