ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/6] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Date Fri, 19 Feb 2016 07:11:39 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232

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


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

Branch: refs/heads/ignite-1232
Commit: 706ada06e44ff19e223cb32ab06b85f5a018c72a
Parents: fce714c ff062d9
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Feb 19 10:08:35 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Feb 19 10:08:35 2016 +0300

----------------------------------------------------------------------
 .../cache/GridCacheDeploymentManager.java       |   8 +-
 .../processors/cache/GridCacheEntryEx.java      |   2 +-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../processors/cache/GridCacheMapEntry.java     | 105 ++---
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/GridCacheTtlManager.java   |  75 +++-
 .../distributed/dht/GridDhtCacheAdapter.java    |  29 +-
 .../distributed/dht/GridDhtCacheEntry.java      |   2 +-
 .../distributed/near/GridNearCacheEntry.java    |   4 +-
 .../cache/query/GridCacheQueryManager.java      | 424 +++++++++++++------
 .../transactions/IgniteTxLocalAdapter.java      |   4 +-
 .../cache/GridCacheDeploymentSelfTest.java      |  78 +++-
 ...CacheAtomicLocalOffheapExpiryPolicyTest.java |  30 ++
 ...gniteCacheAtomicOffheapExpiryPolicyTest.java |  30 ++
 ...rimaryWriteOrderOffheapExpiryPolicyTest.java |  31 ++
 ...teOrderWithStoreOffheapExpiryPolicyTest.java |  31 ++
 ...AtomicReplicatedOffheapExpiryPolicyTest.java |  30 ++
 ...eAtomicWithStoreOffheapExpiryPolicyTest.java |  30 ++
 .../IgniteCacheExpiryPolicyAbstractTest.java    | 169 ++++++--
 .../IgniteCacheExpiryPolicyTestSuite.java       |  13 +
 ...niteCacheTxLocalOffheapExpiryPolicyTest.java |  30 ++
 .../IgniteCacheTxOffheapExpiryPolicyTest.java   |  30 ++
 ...acheTxReplicatedOffheapExpiryPolicyTest.java |  30 ++
 ...CacheTxWithStoreOffheapExpiryPolicyTest.java |  30 ++
 .../testsuites/IgniteBinaryCacheTestSuite.java  |   2 +
 .../query/h2/sql/GridSqlAggregateFunction.java  |  12 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  32 +-
 .../cache/IgniteClientReconnectQueriesTest.java |   9 +-
 28 files changed, 1010 insertions(+), 270 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/706ada06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/706ada06/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index 6cb4bb9,7001717..5db962b
--- 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
@@@ -93,16 -91,14 +93,15 @@@ import static org.apache.ignite.interna
  @SuppressWarnings("TypeMayBeWeakened")
  public class GridSqlQueryParser {
      /** */
-     private static final GridSqlOperationType[] OPERATION_OP_TYPES =
-         {CONCAT, PLUS, MINUS, MULTIPLY, DIVIDE, null, MODULUS};
+     private static final GridSqlOperationType[] OPERATION_OP_TYPES = new GridSqlOperationType[]
{CONCAT, PLUS, MINUS, MULTIPLY, DIVIDE, null, MODULUS};
  
      /** */
-     private static final GridSqlOperationType[] COMPARISON_TYPES =
-         {EQUAL, BIGGER_EQUAL, BIGGER, SMALLER_EQUAL,
+     private static final GridSqlOperationType[] COMPARISON_TYPES = new GridSqlOperationType[]
{
+         EQUAL, BIGGER_EQUAL, BIGGER, SMALLER_EQUAL,
          SMALLER, NOT_EQUAL, IS_NULL, IS_NOT_NULL,
 -        null, null, null, SPATIAL_INTERSECTS /* 11 */, null, null, null, null, EQUAL_NULL_SAFE
/* 16 */, null, null, null, null,
 -        NOT_EQUAL_NULL_SAFE /* 21 */};
 +        null, null, null, SPATIAL_INTERSECTS /* 11 */,
 +        null, null, null, null, EQUAL_NULL_SAFE /* 16 */,
 +        null, null, null, null, NOT_EQUAL_NULL_SAFE /* 21 */};
  
      /** */
      private static final Getter<Select, Expression> CONDITION = getter(Select.class,
"condition");
@@@ -222,8 -218,7 +221,8 @@@
      private static final Getter<Explain, Prepared> EXPLAIN_COMMAND = getter(Explain.class,
"command");
  
      /** */
-     private static final Getter<Command,Prepared> PREPARED =
-         GridSqlQueryParser.<Command,Prepared>getter(CommandContainer.class, "prepared");
 -    private static volatile Getter<Command, Prepared> prepared;
++    private static final Getter<Command, Prepared> PREPARED =
++        GridSqlQueryParser.<Command, Prepared>getter(CommandContainer.class, "prepared");
  
      /** */
      private final IdentityHashMap<Object, Object> h2ObjToGridObj = new IdentityHashMap<>();


Mime
View raw message