ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/43] incubator-ignite git commit: Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Date Wed, 08 Apr 2015 13:17:12 GMT
Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-624

Conflicts:
	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java


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

Branch: refs/heads/ignite-180-1
Commit: 9e7f8a4b81174ed1f048d3f19be37d9b5e4f81c6
Parents: 0e89dde 7e6d193
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Mon Apr 6 17:52:26 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Mon Apr 6 17:52:26 2015 +0300

----------------------------------------------------------------------
 .gitignore                                      |   2 +-
 assembly/release-fabric.xml                     |   5 -
 examples/schema-import/bin/db-init.sql          |  17 ++
 .../streaming/numbers/StreamRandomNumbers.java  |   2 +-
 .../streaming/numbers/StreamRandomNumbers.java  |   2 +-
 modules/clients/readme.md                       |   2 -
 .../configuration/CacheConfiguration.java       |   2 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |  11 +-
 .../ignite/events/CacheQueryReadEvent.java      |  11 +-
 .../ignite/internal/GridCachePluginContext.java |   6 +
 .../apache/ignite/internal/GridComponent.java   |   2 +-
 .../ignite/internal/GridKernalContextImpl.java  |   3 +-
 .../ignite/internal/GridPluginComponent.java    |   4 +-
 .../org/apache/ignite/internal/IgniteEx.java    |   7 -
 .../apache/ignite/internal/IgniteKernal.java    |  27 +--
 .../ignite/internal/IgniteNodeAttributes.java   |   3 -
 .../internal/cluster/ClusterGroupAdapter.java   |   3 +-
 .../internal/managers/GridManagerAdapter.java   |   6 +-
 .../processors/GridProcessorAdapter.java        |   2 +-
 .../processors/cache/CacheDistributionMode.java |  67 -------
 .../internal/processors/cache/CacheType.java    |  77 ++++++++
 .../cache/DynamicCacheChangeRequest.java        |  17 ++
 .../cache/DynamicCacheDescriptor.java           |  15 +-
 .../processors/cache/GridCacheAdapter.java      |   6 +-
 .../processors/cache/GridCacheContext.java      |  26 ++-
 .../cache/GridCacheDeploymentManager.java       |   2 +-
 .../processors/cache/GridCacheEventManager.java |   4 +-
 .../processors/cache/GridCacheMapEntry.java     |   4 +-
 .../processors/cache/GridCacheProcessor.java    | 195 +++++++++++++------
 .../cache/GridCacheSharedContext.java           |   4 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   4 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../cache/query/GridCacheQueryManager.java      |  18 +-
 .../continuous/CacheContinuousQueryHandler.java |   4 +-
 .../continuous/CacheContinuousQueryManager.java |   2 +-
 .../transactions/IgniteTransactionsImpl.java    |  19 +-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../cache/transactions/IgniteTxManager.java     |   8 +-
 .../DiscoveryNodeValidationProcessor.java       |  27 +++
 .../OsDiscoveryNodeValidationProcessor.java     |  72 +++++++
 .../processors/plugin/CachePluginManager.java   |  51 +++--
 .../processors/query/GridQueryProcessor.java    |  12 +-
 .../processors/task/GridTaskProcessor.java      |  24 ++-
 .../internal/visor/util/VisorTaskUtils.java     |  18 +-
 .../ignite/plugin/CachePluginContext.java       |  11 ++
 .../ignite/plugin/CachePluginProvider.java      |   4 +-
 .../org/apache/ignite/plugin/PluginContext.java |   9 +-
 .../ignite/spi/IgniteNodeValidationResult.java  |  66 +++++++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   9 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   2 +-
 .../spi/IgniteSpiNodeValidationResult.java      |  66 -------
 .../communication/tcp/TcpCommunicationSpi.java  |   6 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 113 +----------
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  47 ++---
 .../cache/IgniteInternalCacheTypesTest.java     | 159 +++++++++++++++
 .../IgniteCollectionAbstractTest.java           |  23 ---
 .../IgniteCacheSystemTransactionsSelfTest.java  |   3 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |   2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |   5 +
 .../near/GridCacheNearEvictionSelfTest.java     |   2 +-
 .../near/GridCacheNearReadersSelfTest.java      |   2 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |   8 +-
 ...NearDisabledBasicStoreMultiNodeSelfTest.java |   8 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   4 +-
 .../processors/igfs/IgfsStartCacheTest.java     | 158 +++++++++++++++
 .../processors/igfs/IgsfStartCacheTest.java     | 115 -----------
 .../loadtests/hashmap/GridCacheTestContext.java |   1 +
 .../ignite/messaging/GridMessagingSelfTest.java |  50 +++++
 .../testframework/GridSpiTestContext.java       |   2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   2 +
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   5 -
 .../query/h2/sql/GridSqlQuerySplitter.java      |  24 ++-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   4 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  13 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  14 +-
 ...niteCacheAtomicNearEnabledQuerySelfTest.java |   7 +-
 .../near/IgniteCacheAtomicQuerySelfTest.java    |   7 +-
 .../query/h2/sql/GridQueryParsingTest.java      |   1 +
 .../query/h2/sql/IgniteVsH2QueryTest.java       |   7 +
 modules/yardstick/README.md                     |   3 +-
 .../yardstick/IgniteAbstractBenchmark.java      |   5 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  22 ++-
 .../org/apache/ignite/yardstick/IgniteNode.java |  11 +-
 parent/pom.xml                                  |  50 ++---
 pom.xml                                         |  94 ++++++++-
 scripts/git-apply-patch.sh                      |  94 +++++++++
 scripts/git-format-patch.sh                     |  87 +++++++++
 scripts/git-patch-functions.sh                  | 171 ++++++++++++++++
 scripts/git-patch-prop.sh                       |  24 +++
 90 files changed, 1613 insertions(+), 706 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index e98169c,b3deea3..f343b01
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@@ -115,20 -111,27 +117,27 @@@ public class GridSqlQuerySplitter 
          }
  
          // -- ORDER BY
 -        if (!srcQry.sort().isEmpty()) {
 +        if (!srcSelect.sort().isEmpty()) {
+             if (aggregateFound) // Ordering over aggregates does not make sense.
+                 mapQry.clearSort(); // Otherwise map sort will be used by offset-limit.
+ 
 -            for (GridSqlSortColumn sortCol : srcQry.sort().values())
 +            for (GridSqlSortColumn sortCol : srcSelect.sort().values())
                  rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()),
sortCol);
          }
  
          // -- LIMIT
-         if (srcSelect.limit() != null)
-             rdcQry.limit(srcSelect.limit());
+         if (srcQry.limit() != null) {
+             if (aggregateFound)
+                 mapQry.limit(null);
+ 
+             rdcQry.limit(srcQry.limit());
+         }
  
          // -- OFFSET
 -        if (srcQry.offset() != null) {
 +        if (srcSelect.offset() != null) {
              mapQry.offset(null);
  
 -            rdcQry.offset(srcQry.offset());
 +            rdcQry.offset(srcSelect.offset());
          }
  
          // -- DISTINCT

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9e7f8a4b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------


Mime
View raw message