You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/04/09 19:06:43 UTC
[1/8] incubator-ignite git commit: # IGNITE-703 Muted unneeded daemon
node output.
Repository: incubator-ignite
Updated Branches:
refs/heads/gg-10046 d84bccd1d -> cf058808b
# IGNITE-703 Muted unneeded daemon node output.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7466be28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7466be28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7466be28
Branch: refs/heads/gg-10046
Commit: 7466be2871b43c98d1699a4f393fb1aaa5cc6769
Parents: 9d183c5
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 9 14:02:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 9 14:02:28 2015 +0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/ignite/visor/visor.scala | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7466be28/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 33ba976..b9981f1 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
import org.apache.ignite.internal.util.lang.{GridFunc => F}
import org.apache.ignite.internal.util.typedef._
import org.apache.ignite.internal.util.{GridConfigurationFinder, IgniteUtils => U}
+import org.apache.ignite.logger.NullLogger
import org.apache.ignite.internal.visor.VisorTaskArgument
import org.apache.ignite.internal.visor.cache._
import org.apache.ignite.internal.visor.node._
@@ -1608,6 +1609,8 @@ object visor extends VisorTag {
// Make sure visor starts without shutdown hook.
System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
+ cfg.setGridLogger(new NullLogger)
+
val startedGridName = try {
Ignition.start(cfg).name
}
[3/8] incubator-ignite git commit: ignite-sprint-3 - sql
Posted by sb...@apache.org.
ignite-sprint-3 - sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/968a3ad3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/968a3ad3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/968a3ad3
Branch: refs/heads/gg-10046
Commit: 968a3ad35b98a6989f0f64003166f977564af713
Parents: 27b6b78
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Apr 9 18:05:57 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Apr 9 18:05:57 2015 +0300
----------------------------------------------------------------------
.../query/h2/sql/GridSqlQueryParser.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/968a3ad3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index b174d71..3817c1a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -199,9 +199,7 @@ public class GridSqlQueryParser {
else if (tbl instanceof TableView) {
Query qry = VIEW_QUERY.get((TableView)tbl);
- assert0(qry instanceof Select, qry);
-
- res = new GridSqlSubquery(parse((Select)qry));
+ res = new GridSqlSubquery(parse(qry));
}
else if (tbl instanceof FunctionTable)
res = parseExpression(FUNC_EXPR.get((FunctionTable)tbl));
@@ -518,8 +516,18 @@ public class GridSqlQueryParser {
GridSqlFunction res = new GridSqlFunction(null, f.getName());
- for (Expression arg : f.getArgs())
- res.addChild(parseExpression(arg));
+ if (f.getArgs() != null) {
+ for (Expression arg : f.getArgs()) {
+ if (arg == null) {
+ if (f.getFunctionType() != Function.CASE)
+ throw new IllegalStateException("Function type with null arg: " + f.getFunctionType());
+
+ continue;
+ }
+
+ res.addChild(parseExpression(arg));
+ }
+ }
if (f.getFunctionType() == Function.CAST || f.getFunctionType() == Function.CONVERT)
res.setCastType(new Column(null, f.getType(), f.getPrecision(), f.getScale(), f.getDisplaySize())
@@ -535,8 +543,10 @@ public class GridSqlQueryParser {
GridSqlFunction res = new GridSqlFunction(alias.getSchema().getName(), f.getName());
- for (Expression arg : f.getArgs())
- res.addChild(parseExpression(arg));
+ if (f.getArgs() != null) {
+ for (Expression arg : f.getArgs())
+ res.addChild(parseExpression(arg));
+ }
return res;
}
[4/8] incubator-ignite git commit: Merge branch 'ignite-sprint-3' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3765f5d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3765f5d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3765f5d3
Branch: refs/heads/gg-10046
Commit: 3765f5d3312a13ffe5b28821ad2fadd91b09cee8
Parents: 968a3ad e7fa0a9
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Apr 9 18:06:11 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Apr 9 18:06:11 2015 +0300
----------------------------------------------------------------------
.../datastructures/IgniteQueueExample.java | 28 +-
.../datastructures/IgniteSetExample.java | 30 +-
.../configuration/CacheConfiguration.java | 20 +-
.../configuration/CollectionConfiguration.java | 114 ++++-
.../ignite/internal/GridPluginContext.java | 15 +-
.../apache/ignite/internal/IgniteKernal.java | 16 +-
.../ignite/internal/MarshallerContextImpl.java | 3 +
.../affinity/GridAffinityProcessor.java | 5 +-
.../processors/cache/GridCacheProcessor.java | 63 ++-
.../continuous/CacheContinuousQueryManager.java | 28 --
.../cacheobject/IgniteCacheObjectProcessor.java | 5 +-
.../IgniteCacheObjectProcessorImpl.java | 34 +-
.../datastreamer/DataStreamerImpl.java | 8 +-
.../CacheDataStructuresCacheKey.java | 62 +++
.../CacheDataStructuresConfigurationKey.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 222 ++++++++-
.../plugin/IgnitePluginProcessor.java | 58 +--
.../ignite/plugin/CachePluginConfiguration.java | 2 +-
.../org/apache/ignite/plugin/IgnitePlugin.java | 3 -
.../ignite/plugin/PluginConfiguration.java | 10 +-
.../org/apache/ignite/plugin/PluginContext.java | 7 +-
.../apache/ignite/plugin/PluginProvider.java | 4 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueApiSelfAbstractTest.java | 80 ++++
.../GridCacheQueueCleanupSelfTest.java | 11 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +-
.../GridCacheSetAbstractSelfTest.java | 5 +-
.../IgniteCollectionAbstractTest.java | 160 ++-----
.../IgniteDataStructureUniqueNameTest.java | 47 +-
.../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 ++
.../GridCacheLocalAtomicQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalAtomicSetSelfTest.java | 6 +
.../GridCacheLocalOffheapQueueApiSelfTest.java | 31 ++
.../local/GridCacheLocalQueueApiSelfTest.java | 6 +
.../local/GridCacheLocalSetSelfTest.java | 6 +
...artitionedAtomicOffheapQueueApiSelfTest.java | 32 ++
...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 ++
...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 ++
...dCachePartitionedAtomicQueueApiSelfTest.java | 6 +
...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 +
...micQueueFailoverDataConsistencySelfTest.java | 6 +
...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 +
...itionedAtomicQueueRotativeMultiNodeTest.java | 6 +
...chePartitionedAtomicSetFailoverSelfTest.java | 6 +
...rtitionedDataStructuresFailoverSelfTest.java | 6 +
...artitionedOffHeapValuesQueueApiSelfTest.java | 31 ++
...achePartitionedOffHeapValuesSetSelfTest.java | 32 ++
...edOffheapDataStructuresFailoverSelfTest.java | 34 ++
...hePartitionedOffheapSetFailoverSelfTest.java | 32 ++
.../GridCachePartitionedQueueApiSelfTest.java | 6 +
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +
...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +-
...nedQueueFailoverDataConsistencySelfTest.java | 6 +
...CachePartitionedQueueJoinedNodeSelfTest.java | 6 +
...dCachePartitionedQueueMultiNodeSelfTest.java | 6 +
...hePartitionedQueueRotativeMultiNodeTest.java | 6 +
...GridCachePartitionedSetFailoverSelfTest.java | 6 +
.../GridCachePartitionedSetSelfTest.java | 6 +
.../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +-
...eplicatedDataStructuresFailoverSelfTest.java | 6 +
.../GridCacheReplicatedQueueApiSelfTest.java | 11 +
...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 +
...cheReplicatedQueueRotativeMultiNodeTest.java | 6 +
.../GridCacheReplicatedSetSelfTest.java | 6 +
.../IgniteCacheDataStructuresSelfTestSuite.java | 10 +
modules/urideploy/README.txt | 2 +-
modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes
modules/urideploy/licenses/jtidy-license.txt | 50 --
.../urideploy/licenses/jtidy-mit-license.txt | 50 ++
modules/urideploy/pom.xml | 6 -
.../spi/deployment/uri/UriDeploymentSpi.java | 182 +++----
.../uri/scanners/GridUriDeploymentScanner.java | 286 -----------
.../GridUriDeploymentScannerListener.java | 2 +-
.../uri/scanners/UriDeploymentScanner.java | 47 ++
.../scanners/UriDeploymentScannerContext.java | 92 ++++
.../scanners/UriDeploymentScannerManager.java | 221 +++++++++
.../file/GridUriDeploymentFileScanner.java | 311 ------------
.../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++
.../ftp/GridUriDeploymentFtpClient.java | 199 --------
.../ftp/GridUriDeploymentFtpConfiguration.java | 115 -----
.../ftp/GridUriDeploymentFtpException.java | 43 --
.../scanners/ftp/GridUriDeploymentFtpFile.java | 119 -----
.../ftp/GridUriDeploymentFtpScanner.java | 234 ---------
.../uri/scanners/ftp/package-info.java | 22 -
.../http/GridUriDeploymentHttpScanner.java | 423 ----------------
.../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++
...loymentMultiScannersErrorThrottlingTest.java | 3 -
.../GridUriDeploymentMultiScannersSelfTest.java | 3 +-
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 --
.../uri/scanners/ftp/package-info.java | 22 -
91 files changed, 2386 insertions(+), 2420 deletions(-)
----------------------------------------------------------------------
[5/8] incubator-ignite git commit: # Code cleanup: Add missing
@Override.
Posted by sb...@apache.org.
# Code cleanup: Add missing @Override.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d471a0b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d471a0b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d471a0b1
Branch: refs/heads/gg-10046
Commit: d471a0b1cd86e6f7897f211825a970090dd1506c
Parents: 3765f5d
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Apr 9 19:16:33 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Apr 9 19:17:05 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCluster.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 ++++++++++----------
12 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 02fea14..72be3fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -329,5 +329,5 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport {
public void resetMetrics();
/** {@inheritDoc} */
- public IgniteCluster withAsync();
+ @Override public IgniteCluster withAsync();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 5ade136..9281976 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -309,7 +309,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/**
* @return Context.
*/
- public GridCacheContext<K, V> context() {
+ @Override public GridCacheContext<K, V> context() {
return ctx;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 9730c39..77240e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -116,7 +116,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
*
* @return Cache context.
*/
- public GridCacheContext<K, V> context() {
+ @Override public GridCacheContext<K, V> context() {
return cctx;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 2e8449e..ee64acf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -104,7 +104,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
/**
* @return Cache context.
*/
- public GridCacheContext context() {
+ @Override public GridCacheContext context() {
return ctx;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
index 40839fb..aca1ff0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
@@ -148,7 +148,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V> {
*
* @return Query.
*/
- public <R> CacheQuery<R> createSpiQuery() {
+ @Override public <R> CacheQuery<R> createSpiQuery() {
return new GridCacheQueryAdapter<>(ctx,
SPI,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index 4bd0c3e..812d656 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -76,7 +76,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
}
/** {@inheritDoc} */
- public GridCacheVersion conflictVersion() {
+ @Override public GridCacheVersion conflictVersion() {
return drVer;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 3e02acd..1f761be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -90,7 +90,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
}
/** {@inheritDoc} */
- @Nullable public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, Object obj, boolean userObj) {
+ @Override @Nullable public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, Object obj, boolean userObj) {
if (obj instanceof KeyCacheObject)
return (KeyCacheObject)obj;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
index 08e3f65..9fd7356 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueAdapter.java
@@ -523,7 +523,7 @@ public abstract class GridCacheQueueAdapter<T> extends AbstractCollection<T> imp
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public void close() {
+ @Override public void close() {
if (rmvd)
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
index 6773634..6f5d775 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridMetadataAwareAdapter.java
@@ -385,7 +385,7 @@ public class GridMetadataAwareAdapter {
/** {@inheritDoc} */
@SuppressWarnings({"CloneDoesntDeclareCloneNotSupportedException", "OverriddenMethodCallDuringObjectConstruction"})
- public Object clone() {
+ @Override public Object clone() {
try {
GridMetadataAwareAdapter clone = (GridMetadataAwareAdapter)super.clone();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 6cd439b..ff84e5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -738,7 +738,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
* @param ignite Ignite.
*/
@IgniteInstanceResource
- protected void injectResources(Ignite ignite) {
+ @Override protected void injectResources(Ignite ignite) {
super.injectResources(ignite);
if (ignite != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index e949846..9cde198 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -151,7 +151,7 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
* @param ignite Ignite.
*/
@IgniteInstanceResource
- protected void injectResources(Ignite ignite) {
+ @Override protected void injectResources(Ignite ignite) {
super.injectResources(ignite);
// Inject resource.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d471a0b1/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java b/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
index 96b963e..7667e63 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/javadoc/IgniteLinkTaglet.java
@@ -35,49 +35,49 @@ public class IgniteLinkTaglet implements Taglet {
/**
* Return the name of this custom tag.
*/
- public String getName() {
+ @Override public String getName() {
return NAME;
}
/**
* @return true since this tag can be used in a field doc comment.
*/
- public boolean inField() {
+ @Override public boolean inField() {
return true;
}
/**
* @return true since this tag can be used in a constructor doc comment.
*/
- public boolean inConstructor() {
+ @Override public boolean inConstructor() {
return true;
}
/**
* @return true since this tag can be used in a method doc comment.
*/
- public boolean inMethod() {
+ @Override public boolean inMethod() {
return true;
}
/**
* @return true since this tag can be used in an overview doc comment.
*/
- public boolean inOverview() {
+ @Override public boolean inOverview() {
return true;
}
/**
* @return true since this tag can be used in a package doc comment.
*/
- public boolean inPackage() {
+ @Override public boolean inPackage() {
return true;
}
/**
* @return true since this.
*/
- public boolean inType() {
+ @Override public boolean inType() {
return true;
}
@@ -86,7 +86,7 @@ public class IgniteLinkTaglet implements Taglet {
*
* @return true since this is an inline tag.
*/
- public boolean isInlineTag() {
+ @Override public boolean isInlineTag() {
return true;
}
@@ -117,7 +117,7 @@ public class IgniteLinkTaglet implements Taglet {
*
* @param tag <code>Tag</code> representation of this custom tag.
*/
- public String toString(Tag tag) {
+ @Override public String toString(Tag tag) {
if (tag.text() == null || tag.text().isEmpty())
return "";
@@ -159,7 +159,7 @@ public class IgniteLinkTaglet implements Taglet {
*
* @param tags the array of <code>Tag</code>s representing of this custom tag.
*/
- public String toString(Tag[] tags) {
+ @Override public String toString(Tag[] tags) {
return null;
}
}
[6/8] incubator-ignite git commit: Merge branches 'ignite-703' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-3
Posted by sb...@apache.org.
Merge branches 'ignite-703' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8500053b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8500053b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8500053b
Branch: refs/heads/gg-10046
Commit: 8500053b7e0e7eb63c07cbbe0dbed45ea9376910
Parents: 3765f5d 7466be2
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 9 23:17:31 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 9 23:17:31 2015 +0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/ignite/visor/visor.scala | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[2/8] incubator-ignite git commit: ignite-sprint-3 - sql tests
Posted by sb...@apache.org.
ignite-sprint-3 - sql tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27b6b788
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27b6b788
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27b6b788
Branch: refs/heads/gg-10046
Commit: 27b6b78875ad803c3c8b19fb4410e00f48791e92
Parents: 245f467
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Apr 9 18:02:15 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Apr 9 18:02:15 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/sql/BaseH2CompareQueryTest.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27b6b788/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 3cafab2..7f07069 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -305,17 +305,19 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
* @throws SQLException If failed.
*/
public void testAggregateOrderBy() throws SQLException {
- compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc");
+ compareOrderedQueryRes0(
+ "select firstName name, count(*) cnt from \"part\".Person " +
+ "group by name order by cnt, name desc");
}
/**
* @throws Exception If failed.
*/
public void testNullParamSubstitution() throws Exception {
- List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null);
+ List<List<?>> rs1 = compareQueryRes0("select ? from \"part\".Person", null);
// Ensure we find something.
- assertNotSame(0, rs1.size());
+ assertFalse(rs1.isEmpty());
}
/**
@@ -329,8 +331,8 @@ public class BaseH2CompareQueryTest extends AbstractH2CompareQueryTest {
base = "select firstName||lastName name, salary from \"part\".Person";
- assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
- assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
+ assertEquals(PERS_CNT * 2, compareOrderedQueryRes0(base + " union all " + base + " order by salary desc").size());
+ assertEquals(PERS_CNT, compareOrderedQueryRes0(base + " union " + base + " order by salary desc").size());
}
/**
[7/8] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a60f47db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a60f47db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a60f47db
Branch: refs/heads/gg-10046
Commit: a60f47db923d9395e72d710d9aed4af529acdac5
Parents: 8500053 d471a0b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Apr 9 23:18:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Apr 9 23:18:28 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCluster.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 ++++++++++----------
12 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[8/8] incubator-ignite git commit: Merge branch 'ignite-sprint-3'
into gg-10046
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-3' into gg-10046
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf058808
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf058808
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf058808
Branch: refs/heads/gg-10046
Commit: cf058808bb5bedfcbc491f842c6162af8f850a7d
Parents: d84bccd a60f47d
Author: Artem Shutak <as...@gridgain.com>
Authored: Thu Apr 9 20:06:31 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Thu Apr 9 20:06:31 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCluster.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/query/GridCacheQueriesImpl.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../datastructures/GridCacheQueueAdapter.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +-
.../query/h2/sql/GridSqlQueryParser.java | 24 ++++++++++++++------
.../query/h2/sql/BaseH2CompareQueryTest.java | 12 ++++++----
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 ++++++++--------
.../scala/org/apache/ignite/visor/visor.scala | 3 +++
15 files changed, 48 insertions(+), 33 deletions(-)
----------------------------------------------------------------------