ignite git commit: IGNITE-5912: Redis EXPIRE/PEXPIRE commands. - Fixes #2383.
Repository: ignite
Updated Branches:
refs/heads/master aa81dd14a -> 988ffe3e1
IGNITE-5912: Redis EXPIRE/PEXPIRE commands. - Fixes #2383.
Signed-off-by: shroman
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/988ffe3e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/988ffe3e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/988ffe3e
Branch: refs/heads/master
Commit: 988ffe3e131792072e743e103f524ec20394f8e0
Parents: aa81dd1
Author: shroman
Authored: Thu Aug 10 09:51:05 2017 +0900
Committer: shroman
Committed: Thu Aug 10 09:51:05 2017 +0900
--
.../tcp/redis/RedisProtocolStringSelfTest.java | 44
.../processors/rest/GridRestCommand.java| 3 +
.../handlers/cache/GridCacheCommandHandler.java | 75 +-
.../key/GridRedisExpireCommandHandler.java | 101 +++
.../protocols/tcp/redis/GridRedisCommand.java | 4 +
.../tcp/redis/GridRedisNioListener.java | 2 +
6 files changed, 228 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/988ffe3e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
index 68b42c4..21a9882 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringSelfTest.java
@@ -423,4 +423,48 @@ public class RedisProtocolStringSelfTest extends
RedisCommonAbstractTest {
Assert.assertEquals(2, (long)jedis.exists("existsKey1",
"existsKey2"));
}
}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testExpire() throws Exception {
+testExpire(new Expiration() {
+@Override public long expire(Jedis jedis, String key) {
+return jedis.expire("k1", 2);
+}
+});
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testExpireMs() throws Exception {
+testExpire(new Expiration() {
+@Override public long expire(Jedis jedis, String key) {
+return jedis.pexpire("k1", 2000);
+}
+});
+}
+
+private void testExpire(Expiration exp) throws Exception {
+try (Jedis jedis = pool.getResource()) {
+jedis.set("k1", "v1");
+
+Assert.assertTrue(jedis.exists("k1"));
+
+Assert.assertEquals(1L, exp.expire(jedis, "k1"));
+
+Assert.assertEquals("v1", jedis.get("k1"));
+
+Thread.sleep(2100);
+
+Assert.assertFalse(jedis.exists("k1"));
+
+Assert.assertEquals(0L, (long)jedis.expire("k1", 2));
+}
+}
+
+private interface Expiration {
+long expire(Jedis jedis, String key);
+}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/988ffe3e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
index 2ed370d..24b4bda 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
@@ -99,6 +99,9 @@ public enum GridRestCommand {
/** Cache size. */
CACHE_SIZE("size"),
+/** Set TTL for the key. */
+CACHE_UPDATE_TLL("updatettl"),
+
/** Cache metadata. */
CACHE_METADATA("metadata"),
http://git-wip-us.apache.org/repos/asf/ignite/blob/988ffe3e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index f2ca071..53342c9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++
b/modules/core/src/main/ja
svn commit: r1804593 - /ignite/site/trunk/blogs.html
Author: dmagda Date: Wed Aug 9 18:19:08 2017 New Revision: 1804593 URL: http://svn.apache.org/viewvc?rev=1804593&view=rev Log: removed blog Modified: ignite/site/trunk/blogs.html Modified: ignite/site/trunk/blogs.html URL: http://svn.apache.org/viewvc/ignite/site/trunk/blogs.html?rev=1804593&r1=1804592&r2=1804593&view=diff == Binary files - no diff available.
ignite git commit: IGNITE-5658 Optimizations for data streamer
Repository: ignite
Updated Branches:
refs/heads/master 0e0c2c7dc -> aa81dd14a
IGNITE-5658 Optimizations for data streamer
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa81dd14
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa81dd14
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa81dd14
Branch: refs/heads/master
Commit: aa81dd14a7d0e21d448acf23a8a3d4eca0f8
Parents: 0e0c2c7
Author: Igor Seliverstov
Authored: Wed Aug 9 19:29:39 2017 +0300
Committer: Yakov Zhdanov
Committed: Wed Aug 9 19:29:39 2017 +0300
--
.../org/apache/ignite/IgniteDataStreamer.java | 26 +-
.../apache/ignite/IgniteSystemProperties.java | 8 +
.../ignite/internal/GridKernalContext.java | 2 +-
.../ignite/internal/GridKernalContextImpl.java | 6 +-
.../apache/ignite/internal/IgniteKernal.java| 5 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../org/apache/ignite/internal/IgnitionEx.java | 23 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 5 +-
.../managers/communication/GridIoManager.java | 6 +
.../managers/communication/GridIoMessage.java | 3 +
.../cache/persistence/freelist/PagesList.java | 67 +++--
.../wal/reader/StandaloneGridKernalContext.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 281 ---
.../datastreamer/DataStreamerRequest.java | 59 +++-
.../ignite/internal/util/StripedExecutor.java | 89 +-
.../org/apache/ignite/thread/IgniteThread.java | 10 +
.../DataStreamProcessorSelfTest.java| 14 +-
.../datastreamer/DataStreamerImplSelfTest.java | 3 +-
18 files changed, 427 insertions(+), 185 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa81dd14/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index e2473dc..b1f5851 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -20,6 +20,7 @@ package org.apache.ignite;
import java.util.Collection;
import java.util.Map;
import javax.cache.CacheException;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.stream.StreamReceiver;
@@ -72,7 +73,7 @@ import org.jetbrains.annotations.Nullable;
* this setting limits maximum allowed number of parallel buffered stream
messages that
* are being processed on remote nodes. If this number is exceeded, then
* {@link #addData(Object, Object)} method will block to control memory
utilization.
- * Default is defined by {@link #DFLT_MAX_PARALLEL_OPS} value.
+ * Default is equal to CPU count on remote node multiply by {@link
#DFLT_PARALLEL_OPS_MULTIPLIER}.
*
*
* {@link #autoFlushFrequency(long)} - automatic flush frequency in
milliseconds. Essentially,
@@ -100,11 +101,23 @@ import org.jetbrains.annotations.Nullable;
*
*/
public interface IgniteDataStreamer extends AutoCloseable {
-/** Default max concurrent put operations count. */
+/**
+ * Default max concurrent put operations count.
+ * @deprecated Is not used anymore.
+ */
+@Deprecated
public static final int DFLT_MAX_PARALLEL_OPS = 16;
-/** Default per node buffer size. */
-public static final int DFLT_PER_NODE_BUFFER_SIZE = 1024;
+/**
+ * Default multiplier for data streamer pool size to get concurrent
batches count for each remote node.
+ *
+ * @see IgniteConfiguration#getDataStreamerThreadPoolSize()
+ * @see #perNodeParallelOperations()
+ */
+public static final int DFLT_PARALLEL_OPS_MULTIPLIER = 8;
+
+/** Default operations batch size to sent to remote node for loading. */
+public static final int DFLT_PER_NODE_BUFFER_SIZE = 512;
/** Default timeout for streamer's operations. */
public static final long DFLT_UNLIMIT_TIMEOUT = -1;
@@ -203,9 +216,11 @@ public interface IgniteDataStreamer extends
AutoCloseable {
*
* This method should be called prior to {@link #addData(Object, Object)}
call.
*
- * If not provided, default value is {@link #DFLT_MAX_PARALLEL_OPS}.
+ * If not provided, default value is calculated as follows
+ * {@link #DFLT_PARALLEL_OPS_MULTIPLIER} * {@code
DATA_STREAMER_POOL_SIZE_ON_REMOTE_NODE}.
*
* @param parallelOps Maximum number of parallel stream operations for a
single node.
+ * @see IgniteConfiguration#getDataStreamerThreadPoolS
ignite git commit: ignite-5918 Adding and searching objects in index tree produces a lot of garbage
Repository: ignite
Updated Branches:
refs/heads/master 8d6e8420f -> 0e0c2c7dc
ignite-5918 Adding and searching objects in index tree produces a lot of garbage
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e0c2c7d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e0c2c7d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e0c2c7d
Branch: refs/heads/master
Commit: 0e0c2c7dc6cece3cc92a13c5430af605606bbcfe
Parents: 8d6e842
Author: Igor Seliverstov
Authored: Wed Aug 9 18:46:53 2017 +0300
Committer: Yakov Zhdanov
Committed: Wed Aug 9 18:46:53 2017 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 1 -
.../query/h2/database/H2TreeIndex.java | 6 +-
.../query/h2/database/InlineIndexHelper.java| 414 ++-
.../h2/database/InlineIndexHelperTest.java | 248 +--
.../IgniteCacheWithIndexingTestSuite.java | 3 +
5 files changed, 642 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 0cf2a82..973eeab 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -1261,7 +1261,6 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
public IgniteFuture>>
invokeAllAsync(Set keys,
EntryProcessor entryProcessor, Object... args) throws
TransactionException;
-
/**
* Invokes an {@link CacheEntryProcessor} against the set of {@link
javax.cache.Cache.Entry}s
* specified by the set of keys.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index eb579c3..d186623 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -145,7 +145,11 @@ public class H2TreeIndex extends GridH2IndexBase {
if
(!InlineIndexHelper.AVAILABLE_TYPES.contains(col.column.getType()))
break;
-InlineIndexHelper idx = new
InlineIndexHelper(col.column.getType(), col.column.getColumnId(), col.sortType);
+InlineIndexHelper idx = new InlineIndexHelper(
+col.column.getType(),
+col.column.getColumnId(),
+col.sortType,
+table.getCompareMode());
res.add(idx);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0e0c2c7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
index 19cf857..1789ac8 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelper.java
@@ -23,8 +23,10 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import org.apache.ignite.internal.pagemem.PageUtils;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.h2.result.SortOrder;
import org.h2.table.IndexColumn;
+import org.h2.value.CompareMode;
import org.h2.value.Value;
import org.h2.value.ValueBoolean;
import org.h2.value.ValueByte;
@@ -84,16 +86,28 @@ public class InlineIndexHelper {
/** */
private final short size;
+/** */
+private final boolean compareBinaryUnsigned;
+
+/** */
+private final boolean compareStringsOptimized;
+
/**
* @param type Index type (see {@link Value}).
* @param colIdx Index column index.
* @param sortType Column sort type (see {@link IndexColumn#sortType}).
*/
-public InlineIndexHelper(int type, int colIdx, int sortType) {
+public InlineIndexHelper(int type, int colI
ignite git commit: IGNITE-6012 Refactored GridJettyRestHandler.processRequest(): replace mapper.writeValueAsString with writeValue(outputStream, v).
Repository: ignite
Updated Branches:
refs/heads/ignite-6012 [created] a0fe6ea46
IGNITE-6012 Refactored GridJettyRestHandler.processRequest(): replace
mapper.writeValueAsString with writeValue(outputStream, v).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0fe6ea4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0fe6ea4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0fe6ea4
Branch: refs/heads/ignite-6012
Commit: a0fe6ea46c54f4c256435644c6954cc4658b7b17
Parents: 8d6e842
Author: Alexey Kuznetsov
Authored: Wed Aug 9 21:00:51 2017 +0700
Committer: Alexey Kuznetsov
Committed: Wed Aug 9 21:00:51 2017 +0700
--
.../http/jetty/GridJettyRestHandler.java| 35 +---
1 file changed, 16 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a0fe6ea4/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
--
diff --git
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index c864a10..b1c5577 100644
---
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -17,7 +17,8 @@
package org.apache.ignite.internal.processors.rest.protocols.http.jetty;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,6 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -362,35 +364,30 @@ public class GridJettyRestHandler extends AbstractHandler
{
throw (Error)e;
}
-String json;
-
try {
-json = jsonMapper.writeValueAsString(cmdRes);
-}
-catch (JsonProcessingException e1) {
-U.error(log, "Failed to convert response to JSON: " + cmdRes, e1);
-
-GridRestResponse resFailed = new GridRestResponse(STATUS_FAILED,
e1.getMessage());
+ServletOutputStream os = res.getOutputStream();
try {
-json = jsonMapper.writeValueAsString(resFailed);
+jsonMapper.writeValue(os, cmdRes);
}
-catch (JsonProcessingException e2) {
-json = "{\"successStatus\": \"1\", \"error:\" \"" +
e2.getMessage() + "\"}}";
-}
-}
+catch (JsonGenerationException | JsonMappingException e1) {
+U.error(log, "Failed to convert response to JSON: " + cmdRes,
e1);
-try {
-if (log.isDebugEnabled())
-log.debug("Parsed command response into JSON object: " + json);
+GridRestResponse resFailed = new
GridRestResponse(STATUS_FAILED, e1.getMessage());
-res.getWriter().write(json);
+try {
+jsonMapper.writeValue(os, resFailed);
+}
+catch (JsonGenerationException | JsonMappingException e2) {
+jsonMapper.writeValue(os, "{\"successStatus\": \"1\",
\"error:\" \"" + e2.getMessage() + "\"}}");
+}
+}
if (log.isDebugEnabled())
log.debug("Processed HTTP request [action=" + act + ",
jsonRes=" + cmdRes + ", req=" + req + ']');
}
catch (IOException e) {
-U.error(log, "Failed to send HTTP response: " + json, e);
+U.error(log, "Failed to send HTTP response: " + cmdRes, e);
}
}
ignite git commit: IGNITE-5987 Added -nq (visor will not quit in batch mode) option for Visor Cmd.
Repository: ignite
Updated Branches:
refs/heads/master 5a559dfa1 -> 8d6e8420f
IGNITE-5987 Added -nq (visor will not quit in batch mode) option for Visor Cmd.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d6e8420
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d6e8420
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d6e8420
Branch: refs/heads/master
Commit: 8d6e8420fdf1fcd853277704fd68c2d48ac1012d
Parents: 5a559df
Author: Alexey Kuznetsov
Authored: Wed Aug 9 18:55:04 2017 +0700
Committer: Alexey Kuznetsov
Committed: Wed Aug 9 18:55:04 2017 +0700
--
.../org/apache/ignite/visor/commands/VisorConsole.scala | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d6e8420/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
index 19d130e..d53a0d5 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
@@ -92,6 +92,7 @@ class VisorConsole {
println("-cfg= - connect with specified
configuration.")
println("-b=- batch mode with file.")
println("-e=cmd1;cmd2;... - batch mode with commands.")
+println("-nq - batch mode will not quit
after execution (useful for alerts monitoring).")
visor.quit()
}
@@ -103,6 +104,10 @@ class VisorConsole {
val cfgFile = argValue("cfg", argLst)
val batchFile = argValue("b", argLst)
val batchCommand = argValue("e", argLst)
+val noBatchQuit = hasArgName("nq", argLst)
+
+if (noBatchQuit && batchFile.isEmpty && batchCommand.isEmpty)
+visor.warn("Option \"-nq\" will be ignored because batch mode
options \"-b\" or \"-e\" were not specified.")
cfgFile.foreach(cfg => {
if (cfg.trim.isEmpty) {
@@ -149,7 +154,10 @@ class VisorConsole {
case Some(cmd) =>
visor.batchMode = true
-new ByteArrayInputStream((cmd + "\nquit\n").getBytes("UTF-8"))
+val script = if (noBatchQuit) cmd else cmd + "\nquit\n"
+
+new ByteArrayInputStream(script.getBytes("UTF-8"))
+
case None => new FileInputStream(FileDescriptor.in)
}
@@ -159,7 +167,7 @@ class VisorConsole {
new TerminalSupport(false) {}
} catch {
-case ignored: ClassNotFoundException => null
+case _: ClassNotFoundException => null
}
val reader = new ConsoleReader(inputStream, System.out, term)
ignite git commit: IGNITE-5897 Fix session init/end logic. This fixes tests.
Repository: ignite
Updated Branches:
refs/heads/master aeafbf10c -> 5a559dfa1
IGNITE-5897 Fix session init/end logic. This fixes tests.
Signed-off-by: nikolay_tikhonov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a559dfa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a559dfa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a559dfa
Branch: refs/heads/master
Commit: 5a559dfa167db3ff90f35ac06624afc2688dacb9
Parents: aeafbf1
Author: Nikolay Izhikov
Authored: Wed Aug 9 13:37:11 2017 +0300
Committer: nikolay_tikhonov
Committed: Wed Aug 9 13:37:11 2017 +0300
--
.../cache/store/CacheStoreManager.java | 4 +++-
.../store/GridCacheStoreManagerAdapter.java | 20 +---
.../cache/transactions/IgniteTxAdapter.java | 9 +++--
3 files changed, 19 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a559dfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
index c56a25c..83428b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
@@ -168,9 +168,11 @@ public interface CacheStoreManager extends
GridCacheManager {
/**
* @param tx Transaction.
* @param commit Commit.
+ * @param last {@code True} if this is last store in transaction.
+ * @param storeSessionEnded {@code True} if session for underlying store
already ended.
* @throws IgniteCheckedException If failed.
*/
-public void sessionEnd(IgniteInternalTx tx, boolean commit, boolean last)
throws IgniteCheckedException;
+public void sessionEnd(IgniteInternalTx tx, boolean commit, boolean last,
boolean storeSessionEnded) throws IgniteCheckedException;
/**
* End session initiated by write-behind store.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a559dfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index 83f07fb..9fe1f0c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -774,7 +774,8 @@ public abstract class GridCacheStoreManagerAdapter extends
GridCacheManagerAdapt
}
/** {@inheritDoc} */
-@Override public final void sessionEnd(IgniteInternalTx tx, boolean
commit, boolean last) throws IgniteCheckedException {
+@Override public final void sessionEnd(IgniteInternalTx tx, boolean
commit, boolean last,
+boolean storeSessionEnded) throws IgniteCheckedException {
assert store != null;
sessionInit0(tx);
@@ -785,7 +786,7 @@ public abstract class GridCacheStoreManagerAdapter extends
GridCacheManagerAdapt
lsnr.onSessionEnd(locSes, commit);
}
-if (!sesHolder.get().ended(store))
+if (!sesHolder.get().ended(store) && !storeSessionEnded)
store.sessionEnd(commit);
}
catch (Throwable e) {
@@ -854,7 +855,7 @@ public abstract class GridCacheStoreManagerAdapter extends
GridCacheManagerAdapt
sesHolder.set(ses);
try {
-if (sesLsnrs != null && !ses.started(this)) {
+if (!ses.started(store) && sesLsnrs != null) {
for (CacheStoreSessionListener lsnr : sesLsnrs)
lsnr.onSessionStart(locSes);
}
@@ -918,11 +919,8 @@ public abstract class GridCacheStoreManagerAdapter extends
GridCacheManagerAdapt
private Object attach;
/** */
-private final Set started =
-new GridSetWrapper<>(new IdentityHashMap());
-
-/** */
-private final Set ended = new GridSetWrapper<>(new
IdentityHashMap());
+private final Set started =
+new GridSetWrapper<>(new IdentityHashMap());
/**
* @param tx Current transaction.
@@ -985,8 +983,8 @@ public abstract class
ignite git commit: IGNITE-5734 Web Console: Fixed npm dependencies.
Repository: ignite Updated Branches: refs/heads/master ebed404bd -> aeafbf10c IGNITE-5734 Web Console: Fixed npm dependencies. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aeafbf10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aeafbf10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aeafbf10 Branch: refs/heads/master Commit: aeafbf10c13af75556a019749e54c9e4251d91b7 Parents: ebed404 Author: Alexey Kuznetsov Authored: Wed Aug 9 17:22:54 2017 +0700 Committer: Alexey Kuznetsov Committed: Wed Aug 9 17:22:54 2017 +0700 -- modules/web-console/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/aeafbf10/modules/web-console/frontend/package.json -- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index 6b049ff..f96c322 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -57,7 +57,7 @@ "babel-polyfill": "6.23.0", "babel-preset-es2015": "6.24.1", "babel-preset-stage-1": "6.24.1", -"babel-runtime": "6.23.0", +"babel-runtime": "6.25.0", "bootstrap-sass": "3.3.7", "brace": "0.10.0", "copy-webpack-plugin": "4.0.1",
ignite git commit: IGNITE-5993: Removed unused SQL-related classes and methods (old tree index, snapshots, etc). This closes #2414.
Repository: ignite
Updated Branches:
refs/heads/master 870ecf89d -> ebed404bd
IGNITE-5993: Removed unused SQL-related classes and methods (old tree index,
snapshots, etc). This closes #2414.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebed404b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebed404b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebed404b
Branch: refs/heads/master
Commit: ebed404bd1932fc8a937ce34140e5a2fd69f5f59
Parents: 870ecf8
Author: devozerov
Authored: Wed Aug 9 11:47:58 2017 +0300
Committer: devozerov
Committed: Wed Aug 9 11:47:58 2017 +0300
--
.../query/h2/opt/GridH2SpatialIndex.java| 7 -
.../processors/query/h2/H2RowDescriptor.java| 11 -
.../processors/query/h2/H2TableEngine.java | 4 +-
.../query/h2/database/H2PkHashIndex.java| 7 -
.../query/h2/database/H2TreeIndex.java | 26 -
.../query/h2/opt/GridH2IndexBase.java | 93 +--
.../query/h2/opt/GridH2QueryContext.java| 59 --
.../query/h2/opt/GridH2RowDescriptor.java | 5 -
.../processors/query/h2/opt/GridH2Table.java| 186 +-
.../query/h2/opt/GridH2TreeIndex.java | 602 ---
.../query/h2/twostep/GridMapQueryExecutor.java | 25 -
.../query/h2/opt/GridH2TableSelfTest.java | 172 --
12 files changed, 7 insertions(+), 1190 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebed404b/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
--
diff --git
a/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
b/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
index 9389290..d83e860 100644
---
a/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
+++
b/modules/geospatial/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2SpatialIndex.java
@@ -31,7 +31,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.query.h2.H2Cursor;
import org.apache.ignite.internal.util.GridCursorIteratorWrapper;
-import org.apache.ignite.internal.util.IgniteTree;
import org.apache.ignite.internal.util.lang.GridCursor;
import org.h2.engine.Session;
import org.h2.index.Cursor;
@@ -51,7 +50,6 @@ import org.h2.table.IndexColumn;
import org.h2.table.TableFilter;
import org.h2.value.Value;
import org.h2.value.ValueGeometry;
-import org.jetbrains.annotations.Nullable;
import static
org.apache.ignite.internal.processors.query.h2.opt.GridH2AbstractKeyValueRow.KEY_COL;
@@ -158,11 +156,6 @@ public class GridH2SpatialIndex extends GridH2IndexBase
implements SpatialIndex
}
/** {@inheritDoc} */
-@Nullable @Override protected IgniteTree doTakeSnapshot() {
-return null; // TODO We do not support snapshots, but probably this is
possible.
-}
-
-/** {@inheritDoc} */
@Override public GridH2Row put(GridH2Row row) {
assert row instanceof GridH2AbstractKeyValueRow : "requires key to be
at 0";
http://git-wip-us.apache.org/repos/asf/ignite/blob/ebed404b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
index dab83d1..31f0e69 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java
@@ -107,9 +107,6 @@ public class H2RowDescriptor implements GridH2RowDescriptor
{
private final GridUnsafeGuard guard;
/** */
-private final boolean snapshotableIdx;
-
-/** */
private final GridQueryProperty[] props;
/** Id of user-defined key column */
@@ -170,9 +167,6 @@ public class H2RowDescriptor implements GridH2RowDescriptor
{
valueAliasColumnId =
(type.valueFieldName() != null) ? DEFAULT_COLUMNS_COUNT +
fieldsList.indexOf(type.valueFieldAlias()) : -1;
-
-// Index is not snapshotable in db-x.
-snapshotableIdx = false;
}
/** {@inheritDoc} */
@@ -382,11 +376,6 @@ public class H2RowDescriptor implements
GridH2RowDescriptor {
}
/** {@inheritDoc} */
-@Override public boolean s
