[1/4] ignite git commit: Minors.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-10291 10f5f9e32 -> 8a2a8610a


Minors.


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

Branch: refs/heads/ignite-10291
Commit: b35634bf58a3deb903f4ba9590c36eaa16d8fa4a
Parents: 10f5f9e
Author: devozerov 
Authored: Wed Nov 28 12:51:32 2018 +0300
Committer: devozerov 
Committed: Wed Nov 28 12:51:32 2018 +0300

--
 .../ignite/internal/processors/query/GridQueryProcessor.java  | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b35634bf/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index d3f2930..95ff3d5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -1764,9 +1764,10 @@ public class GridQueryProcessor extends 
GridProcessorAdapter {
 GridCompoundFuture fut = new GridCompoundFuture();
 
 for (Map.Entry e : 
types.entrySet()) {
-if (cacheIds.contains(CU.cacheId(e.getKey().cacheName())) &&
-processedCacheNames.add(e.getKey().cacheName()))
-fut.add(rebuildIndexesFromHash(e.getKey().cacheName(), 
e.getValue()));
+String cacheName = e.getKey().cacheName();
+
+if (cacheIds.contains(CU.cacheId(cacheName)) && 
processedCacheNames.add(cacheName))
+fut.add(rebuildIndexesFromHash(cacheName, e.getValue()));
 }
 
 fut.markInitialized();

[1/4] ignite git commit: Minors.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1926 d0f7252ca -> b7e2a3357


Minors.


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

Branch: refs/heads/ignite-1926
Commit: c358487b76dfb4662a913ec029814546359eb2b3
Parents: d0f7252
Author: vozerov-gridgain 
Authored: Mon Aug 8 13:27:30 2016 +0300
Committer: vozerov-gridgain 
Committed: Mon Aug 8 13:27:30 2016 +0300

--
 .../hadoop/fs/LocalIgfsSecondaryFileSystem.java | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c358487b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/LocalIgfsSecondaryFileSystem.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/LocalIgfsSecondaryFileSystem.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/LocalIgfsSecondaryFileSystem.java
index ab5a023..785430a 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/LocalIgfsSecondaryFileSystem.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/LocalIgfsSecondaryFileSystem.java
@@ -167,6 +167,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 /** {@inheritDoc} */
 @Override public boolean exists(IgfsPath path) {
 try {
+// TODO
 return fileSystemForUser().exists(convert(path));
 }
 catch (IOException e) {
@@ -176,6 +177,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 
 /** {@inheritDoc} */
 @Nullable @Override public IgfsFile update(IgfsPath path, Map props) {
+// TODO
 HadoopIgfsProperties props0 = new HadoopIgfsProperties(props);
 
 final FileSystem fileSys = fileSystemForUser();
@@ -197,6 +199,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 
 /** {@inheritDoc} */
 @Override public void rename(IgfsPath src, IgfsPath dest) {
+// TODO
 // Delegate to the secondary file system.
 try {
 if (!fileSystemForUser().rename(convert(src), convert(dest)))
@@ -238,6 +241,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 /** {@inheritDoc} */
 @Override public Collection listPaths(IgfsPath path) {
 try {
+// TODO
 FileStatus[] statuses = 
fileSystemForUser().listStatus(convert(path));
 
 if (statuses == null)
@@ -261,6 +265,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 /** {@inheritDoc} */
 @Override public Collection listFiles(IgfsPath path) {
 try {
+// TODO
 FileStatus[] statuses = 
fileSystemForUser().listStatus(convert(path));
 
 if (statuses == null)
@@ -334,6 +339,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 /** {@inheritDoc} */
 @Override public IgfsFile info(final IgfsPath path) {
 try {
+// TODO
 final FileStatus status = 
fileSystemForUser().getFileStatus(convert(path));
 
 if (status == null)
@@ -407,6 +413,7 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 /** {@inheritDoc} */
 @Override public long usedSpaceSize() {
 try {
+// TODO
 // We don't use FileSystem#getUsed() since it counts only the files
 // in the filesystem root, not all the files recursively.
 return fileSystemForUser().getContentSummary(new 
Path("/")).getSpaceConsumed();
@@ -417,15 +424,6 @@ public class LocalIgfsSecondaryFileSystem implements 
IgfsSecondaryFileSystem, Li
 }
 
 /**
- * Gets the underlying {@link FileSystem}.
- * This method is used solely for testing.
- * @return the underlying Hadoop {@link FileSystem}.
- */
-public FileSystem fileSystem() {
-return fileSystemForUser();
-}
-
-/**
  * Gets the FileSystem for the current context user.
  * @return the FileSystem instance, never null.
  */