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/03/01 13:39:54 UTC
[01/37] incubator-ignite git commit: #ignite-311: New logo.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-239 8476463b9 -> 55669d46b
#ignite-311: New logo.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/446192fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/446192fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/446192fa
Branch: refs/heads/ignite-239
Commit: 446192fafdca3f3ec9d58e9b78fd17417e62de3d
Parents: b14aafb
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 19 18:08:18 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 19 18:08:18 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/446192fa/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 8f1179f..e352099 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1534,7 +1534,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
U.quiet(false,
" __________ ________________ ",
" / _/ ___/ |/ / _/_ __/ __/ ",
- " _/ // (_ / // / / / / _/ ",
+ " _/ // (7 7 // / / / / _/ ",
"/___/\\___/_/|_/___/ /_/ /___/ ",
" ",
ver,
@@ -1554,7 +1554,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
log.info(NL + NL +
">>> __________ ________________ " + NL +
">>> / _/ ___/ |/ / _/_ __/ __/ " + NL +
- ">>> _/ // (_ / // / / / / _/ " + NL +
+ ">>> _/ // (7 7 // / / / / _/ " + NL +
">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
">>> " + NL +
">>> " + ver + NL +
[33/37] incubator-ignite git commit: sprint-2 - Added
isWithinTransaction() method to session.
Posted by sb...@apache.org.
sprint-2 - Added isWithinTransaction() method to session.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/16105ec9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16105ec9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16105ec9
Branch: refs/heads/ignite-239
Commit: 16105ec9687732d0b01cfeaee9a5b1c227b0921f
Parents: 6097e7b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 09:44:30 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 09:44:30 2015 -0800
----------------------------------------------------------------------
.../store/jdbc/CacheJdbcPersonStore.java | 110 +++++++------------
.../ignite/cache/store/CacheStoreSession.java | 9 ++
.../processors/cache/GridCacheStoreManager.java | 6 +-
.../junits/cache/TestCacheSession.java | 5 +
.../cache/TestThreadLocalCacheSession.java | 5 +
5 files changed, 62 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index d80861d..0473280 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.store.*;
import org.apache.ignite.examples.datagrid.store.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -72,8 +71,6 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
/** {@inheritDoc} */
@Override public void txEnd(boolean commit) {
- Transaction tx = transaction();
-
Map<String, Connection> props = ses.properties();
try (Connection conn = props.remove(ATTR_NAME)) {
@@ -84,23 +81,21 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
conn.rollback();
}
- System.out.println(">>> Transaction ended [xid=" + tx.xid() + ", commit=" + commit + ']');
+ System.out.println(">>> Transaction ended [commit=" + commit + ']');
}
catch (SQLException e) {
- throw new CacheWriterException("Failed to end transaction [xid=" + tx.xid() + ", commit=" + commit + ']', e);
+ throw new CacheWriterException("Failed to end transaction: " + ses.transaction(), e);
}
}
/** {@inheritDoc} */
@Override public Person load(Long key) {
- Transaction tx = transaction();
-
- System.out.println(">>> Store load [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+ System.out.println(">>> Loading key: " + key);
Connection conn = null;
try {
- conn = connection(tx);
+ conn = connection();
try (PreparedStatement st = conn.prepareStatement("select * from PERSONS where id=?")) {
st.setString(1, key.toString());
@@ -108,14 +103,14 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
ResultSet rs = st.executeQuery();
if (rs.next())
- return person(rs.getLong(1), rs.getString(2), rs.getString(3));
+ return new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
}
}
catch (SQLException e) {
throw new CacheLoaderException("Failed to load object: " + key, e);
}
finally {
- end(tx, conn);
+ end(conn);
}
return null;
@@ -123,60 +118,57 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
/** {@inheritDoc} */
@Override public void write(Cache.Entry<? extends Long, ? extends Person> entry) {
- Transaction tx = transaction();
-
Long key = entry.getKey();
Person val = entry.getValue();
- System.out.println(">>> Store put [key=" + key + ", val=" + val + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+ System.out.println(">>> Putting [key=" + key + ", val=" + val + ']');
Connection conn = null;
try {
- conn = connection(tx);
+ conn = connection();
- int updated;
+ int updated;
- try (PreparedStatement st = conn.prepareStatement(
- "update PERSONS set firstName=?, lastName=? where id=?")) {
- st.setString(1, val.getFirstName());
- st.setString(2, val.getLastName());
- st.setLong(3, val.getId());
+ // Try update first.
+ try (PreparedStatement st = conn.prepareStatement(
+ "update PERSONS set firstName=?, lastName=? where id=?")) {
+ st.setString(1, val.getFirstName());
+ st.setString(2, val.getLastName());
+ st.setLong(3, val.getId());
- updated = st.executeUpdate();
- }
+ updated = st.executeUpdate();
+ }
- // If update failed, try to insert.
- if (updated == 0) {
- try (PreparedStatement st = conn.prepareStatement(
- "insert into PERSONS (id, firstName, lastName) values(?, ?, ?)")) {
- st.setLong(1, val.getId());
- st.setString(2, val.getFirstName());
- st.setString(3, val.getLastName());
+ // If update failed, try to insert.
+ if (updated == 0) {
+ try (PreparedStatement st = conn.prepareStatement(
+ "insert into PERSONS (id, firstName, lastName) values(?, ?, ?)")) {
+ st.setLong(1, val.getId());
+ st.setString(2, val.getFirstName());
+ st.setString(3, val.getLastName());
- st.executeUpdate();
+ st.executeUpdate();
+ }
}
}
- }
catch (SQLException e) {
throw new CacheLoaderException("Failed to put object [key=" + key + ", val=" + val + ']', e);
}
finally {
- end(tx, conn);
+ end(conn);
}
}
/** {@inheritDoc} */
@Override public void delete(Object key) {
- Transaction tx = transaction();
-
- System.out.println(">>> Store remove [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
+ System.out.println(">>> Removing key: " + key);
Connection conn = null;
try {
- conn = connection(tx);
+ conn = connection();
try (PreparedStatement st = conn.prepareStatement("delete from PERSONS where id=?")) {
st.setLong(1, (Long)key);
@@ -188,7 +180,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
throw new CacheWriterException("Failed to remove object: " + key, e);
}
finally {
- end(tx, conn);
+ end(conn);
}
}
@@ -199,17 +191,13 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
final int entryCnt = (Integer)args[0];
- Connection conn = null;
-
- try {
- conn = connection(null);
-
+ try (Connection conn = connection()) {
try (PreparedStatement st = conn.prepareStatement("select * from PERSONS")) {
try (ResultSet rs = st.executeQuery()) {
int cnt = 0;
while (cnt < entryCnt && rs.next()) {
- Person person = person(rs.getLong(1), rs.getString(2), rs.getString(3));
+ Person person = new Person(rs.getLong(1), rs.getString(2), rs.getString(3));
clo.apply(person.getId(), person);
@@ -223,18 +211,16 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
catch (SQLException e) {
throw new CacheLoaderException("Failed to load values from cache store.", e);
}
- finally {
- end(null, conn);
- }
}
/**
- * @param tx Cache transaction.
* @return Connection.
* @throws SQLException In case of error.
*/
- private Connection connection(@Nullable Transaction tx) throws SQLException {
- if (tx != null) {
+ private Connection connection() throws SQLException {
+ // If there is an ongoing transaction,
+ // we must reuse the same connection.
+ if (ses.isWithinTransaction()) {
Map<Object, Object> props = ses.properties();
Connection conn = (Connection)props.get(ATTR_NAME);
@@ -257,11 +243,10 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
/**
* Closes allocated resources depending on transaction status.
*
- * @param tx Active transaction, if any.
* @param conn Allocated connection.
*/
- private void end(@Nullable Transaction tx, @Nullable Connection conn) {
- if (tx == null && conn != null) {
+ private void end(@Nullable Connection conn) {
+ if (!ses.isWithinTransaction() && conn != null) {
// Close connection right away if there is no transaction.
try {
conn.close();
@@ -286,23 +271,4 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
return conn;
}
-
- /**
- * Builds person object out of provided values.
- *
- * @param id ID.
- * @param firstName First name.
- * @param lastName Last name.
- * @return Person.
- */
- private Person person(Long id, String firstName, String lastName) {
- return new Person(id, firstName, lastName);
- }
-
- /**
- * @return Current transaction.
- */
- private Transaction transaction() {
- return ses != null ? ses.transaction() : null;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index a2be4c5..38fe95c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -43,6 +43,15 @@ public interface CacheStoreSession {
public Transaction transaction();
/**
+ * Returns {@code true} if performing store operation within a transaction,
+ * {@code false} otherwise. Analogous to calling {@code transaction() != null}.
+ *
+ * @return {@code True} if performing store operation within a transaction,
+ * {@code false} otherwise.
+ */
+ public boolean isWithinTransaction();
+
+ /**
* Gets current session properties. You can add properties directly to the
* returned map.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
index fac6ea3..9262a8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
@@ -36,7 +36,6 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.integration.*;
-import java.lang.reflect.*;
import java.util.*;
/**
@@ -913,6 +912,11 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
}
/** {@inheritDoc} */
+ @Override public boolean isWithinTransaction() {
+ return transaction() != null;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <K1, V1> Map<K1, V1> properties() {
SessionData ses0 = sesHolder.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
index cca20fe..0709880 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java
@@ -50,6 +50,11 @@ public class TestCacheSession implements CacheStoreSession {
}
/** {@inheritDoc} */
+ @Override public boolean isWithinTransaction() {
+ return transaction() != null;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <K, V> Map<K, V> properties() {
if (props == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16105ec9/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
index 6687f1f..2bbcf1b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java
@@ -49,6 +49,11 @@ public class TestThreadLocalCacheSession implements CacheStoreSession {
}
/** {@inheritDoc} */
+ @Override public boolean isWithinTransaction() {
+ return transaction() != null;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <K, V> Map<K, V> properties() {
TestCacheSession ses = sesHolder.get();
[23/37] incubator-ignite git commit: # ignite-322: move
txTransactions rollback at finally-block
Posted by sb...@apache.org.
# ignite-322: move txTransactions rollback at finally-block
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ed43d19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ed43d19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ed43d19
Branch: refs/heads/ignite-239
Commit: 5ed43d19995f70e0bd338c74626d5236be3b639a
Parents: 4e57996
Author: Artem Shutak <as...@gridgain.com>
Authored: Thu Feb 26 13:18:12 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Thu Feb 26 13:18:12 2015 +0300
----------------------------------------------------------------------
.../HibernateReadWriteAccessStrategy.java | 81 +++++++++++++++-----
1 file changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ed43d19/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
index 1b083a1..21320f3 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
@@ -74,30 +74,46 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
/** {@inheritDoc} */
@Override protected Object get(Object key) throws CacheException {
+ boolean success = false;
+
try {
- return cache.get(key);
+ Object o = cache.get(key);
+
+ success = true;
+
+ return o;
}
catch (IgniteCheckedException e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@Override protected void putFromLoad(Object key, Object val) throws CacheException {
+ boolean success = false;
+
try {
cache.putx(key, val);
+
+ success = true;
}
catch (IgniteCheckedException e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@Override protected SoftLock lock(Object key) throws CacheException {
+ boolean success = false;
+
try {
TxContext ctx = txCtx.get();
@@ -107,29 +123,39 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
lockKey(key);
ctx.locked(key);
+
+ success = true;
return null;
}
catch (IgniteCheckedException e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@Override protected void unlock(Object key, SoftLock lock) throws CacheException {
+ boolean success = false;
+
try {
TxContext ctx = txCtx.get();
if (ctx != null)
unlock(ctx, key);
+
+ success = true;
}
catch (Exception e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@@ -139,6 +165,9 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
/** {@inheritDoc} */
@Override protected boolean afterUpdate(Object key, Object val, SoftLock lock) throws CacheException {
+ boolean success = false;
+ boolean res = false;
+
try {
TxContext ctx = txCtx.get();
@@ -146,17 +175,21 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
cache.putx(key, val);
unlock(ctx, key);
-
- return true;
+
+ res = true;
}
+
+ success = true;
- return false;
+ return res;
}
catch (Exception e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@@ -166,31 +199,43 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
/** {@inheritDoc} */
@Override protected boolean afterInsert(Object key, Object val) throws CacheException {
+ boolean success = false;
+
try {
cache.putx(key, val);
+ success = true;
+
return true;
}
catch (IgniteCheckedException e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/** {@inheritDoc} */
@Override protected void remove(Object key) throws CacheException {
+ boolean success = false;
+
try {
TxContext ctx = txCtx.get();
if (ctx != null)
cache.removex(key);
+
+ success = true;
}
catch (IgniteCheckedException e) {
- rollbackCurrentTx();
-
throw new CacheException(e);
}
+ finally {
+ if (!success)
+ rollbackCurrentTx();
+ }
}
/**
[28/37] incubator-ignite git commit: review ignite-311
Posted by sb...@apache.org.
review ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fb1eeb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fb1eeb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fb1eeb5
Branch: refs/heads/ignite-239
Commit: 9fb1eeb55e8eadf9190d0d675f65e5020543ad39
Parents: 2ef2271
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Feb 27 19:09:27 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Feb 27 19:09:27 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridProperties.java | 79 --------------------
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../ignite/internal/IgniteProperties.java | 79 ++++++++++++++++++++
.../ignite/internal/IgniteVersionUtils.java | 8 +-
.../plugin/IgnitePluginProcessor.java | 37 +++------
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
7 files changed, 98 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
deleted file mode 100644
index 89110af..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Ignite properties holder.
- */
-public class GridProperties {
- /** Properties file path. */
- private static final String FILE_PATH = "ignite.properties";
-
- /** Properties. */
- private static final Properties PROPS;
-
- /**
- *
- */
- static {
- PROPS = new Properties();
-
- readProperties(FILE_PATH, PROPS, true);
- }
-
- /**
- * @param path Path.
- * @param props Properties.
- * @param throwExc Flag indicating whether to throw an exception or not.
- */
- public static void readProperties(String path, Properties props, boolean throwExc) {
- try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
- if (is == null) {
- if (throwExc)
- throw new RuntimeException("Failed to find properties file: " + path);
- else
- return;
- }
-
- props.load(is);
- }
- catch (IOException e) {
- throw new RuntimeException("Failed to read properties file: " + path, e);
- }
- }
-
- /**
- * Gets property value.
- *
- * @param key Property key.
- * @return Property value (possibly empty string, but never {@code null}).
- */
- public static String get(String key) {
- return PROPS.getProperty(key, "");
- }
-
- /**
- *
- */
- private GridProperties() {
- // No-op.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
index d1436a9..830481f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java
@@ -42,7 +42,7 @@ import static java.net.URLEncoder.*;
*/
class GridUpdateNotifier {
/** Access URL to be used to access latest version data. */
- private static final String UPD_STATUS_PARAMS = GridProperties.get("ignite.update.status.params");
+ private static final String UPD_STATUS_PARAMS = IgniteProperties.get("ignite.update.status.params");
/** Throttling for logging out. */
private static final long THROTTLE_PERIOD = 24 * 60 * 60 * 1000; // 1 day.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c21ceb3..9c92edd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -100,7 +100,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
private static final long serialVersionUID = 0L;
/** Compatible versions. */
- private static final String COMPATIBLE_VERS = GridProperties.get("ignite.compatible.vers");
+ private static final String COMPATIBLE_VERS = IgniteProperties.get("ignite.compatible.vers");
/** Ignite site that is shown in log messages. */
static final String SITE = "www.gridgain.com";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
new file mode 100644
index 0000000..74c0ce4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteProperties.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Ignite properties holder.
+ */
+public class IgniteProperties {
+ /** Properties file path. */
+ private static final String FILE_PATH = "ignite.properties";
+
+ /** Properties. */
+ private static final Properties PROPS;
+
+ /**
+ *
+ */
+ static {
+ PROPS = new Properties();
+
+ readProperties(FILE_PATH, PROPS, true);
+ }
+
+ /**
+ * @param path Path.
+ * @param props Properties.
+ * @param throwExc Flag indicating whether to throw an exception or not.
+ */
+ public static void readProperties(String path, Properties props, boolean throwExc) {
+ try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
+ if (is == null) {
+ if (throwExc)
+ throw new RuntimeException("Failed to find properties file: " + path);
+ else
+ return;
+ }
+
+ props.load(is);
+ }
+ catch (IOException e) {
+ throw new RuntimeException("Failed to read properties file: " + path, e);
+ }
+ }
+
+ /**
+ * Gets property value.
+ *
+ * @param key Property key.
+ * @return Property value (possibly empty string, but never {@code null}).
+ */
+ public static String get(String key) {
+ return PROPS.getProperty(key, "");
+ }
+
+ /**
+ *
+ */
+ private IgniteProperties() {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
index 51668b6..3c47f23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
@@ -54,13 +54,13 @@ public class IgniteVersionUtils {
* Static initializer.
*/
static {
- VER_STR = GridProperties.get("ignite.version");
+ VER_STR = IgniteProperties.get("ignite.version");
- BUILD_TSTAMP = Long.valueOf(GridProperties.get("ignite.build"));
+ BUILD_TSTAMP = Long.valueOf(IgniteProperties.get("ignite.build"));
BUILD_TSTAMP_STR = new SimpleDateFormat("yyyyMMdd").format(new Date(BUILD_TSTAMP * 1000));
- REV_HASH_STR = GridProperties.get("ignite.revision");
- RELEASE_DATE_STR = GridProperties.get("ignite.rel.date");
+ REV_HASH_STR = IgniteProperties.get("ignite.revision");
+ RELEASE_DATE_STR = IgniteProperties.get("ignite.rel.date");
String rev = REV_HASH_STR.length() > 8 ? REV_HASH_STR.substring(0, 8) : REV_HASH_STR;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index aca8fb8..05f227b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -42,9 +42,6 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
/** */
private volatile Map<Class<?>, Object[]> extensions;
- /** Plugin information. */
- public static final String PLUGIN_INFO = "Configured plugins: ";
-
/**
*
* @param ctx Kernal context.
@@ -206,32 +203,22 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
}
/**
- * Plugin information.
- */
- private String pluginInfo() {
- Collection<PluginProvider> plugins = ctx.plugins().allProviders();
-
- if (plugins.size() == 0)
- return U.nl() + ">>> " + PLUGIN_INFO + "none";
-
- String info = U.nl() + ">>> " + PLUGIN_INFO + U.nl();
-
- for (PluginProvider plugin : plugins)
- info += ">>> " + plugin.name() + " " + plugin.version() + U.nl() +
- ">>> " + plugin.copyright();
-
- return info;
- }
-
- /**
* Print plugin information.
*/
private void ackPluginsInfo() {
- if (log.isQuiet())
- U.quiet(false, pluginInfo().split(U.nl() + ">>> "));
+ U.quietAndInfo(log, "Configured plugins:");
- if (log.isInfoEnabled())
- log.info(pluginInfo());
+ if (plugins.isEmpty()) {
+ U.quietAndInfo(log, " ^-- None");
+ U.quietAndInfo(log, "");
+ }
+ else {
+ for (PluginProvider plugin : plugins.values()) {
+ U.quietAndInfo(log, " ^-- " + plugin.name() + " " + plugin.version());
+ U.quietAndInfo(log, " ^-- " + plugin.copyright());
+ U.quietAndInfo(log, "");
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fb1eeb5/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
index 8cc0b28..07bcf48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java
@@ -36,7 +36,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNotifier() throws Exception {
- GridUpdateNotifier ntf = new GridUpdateNotifier(null, GridProperties.get("ignite.version"),
+ GridUpdateNotifier ntf = new GridUpdateNotifier(null, IgniteProperties.get("ignite.version"),
IgniteKernal.SITE, TEST_GATEWAY, false);
ntf.checkForNewVersion(new SelfExecutor(), log);
[31/37] incubator-ignite git commit: # sprint-2 - javadoc fixes.
Posted by sb...@apache.org.
# sprint-2 - javadoc fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a14ef183
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a14ef183
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a14ef183
Branch: refs/heads/ignite-239
Commit: a14ef18335ad5f6c78c35b711f4bd8d5a40f6910
Parents: 375376b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 00:19:58 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 00:19:58 2015 -0500
----------------------------------------------------------------------
.../org/apache/ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../org/apache/ignite/cache/store/CacheStoreSession.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14ef183/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
index 794281b..58a3f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java
@@ -39,7 +39,7 @@ import java.util.*;
public abstract class CacheStoreAdapter<K, V> implements CacheStore<K, V> {
/**
* Default empty implementation. This method needs to be overridden only if
- * {@link org.apache.ignite.cache.GridCache#loadCache(IgniteBiPredicate, long, Object...)} method
+ * {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)} method
* is explicitly called.
*
* @param clo {@inheritDoc}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a14ef183/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
index 0bfc6fc..a2be4c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java
@@ -23,7 +23,13 @@ import org.apache.ignite.transactions.*;
import java.util.*;
/**
- * Session for the cache store operations.
+ * Session for the cache store operations. The main purpose of cache store session
+ * is to hold context between multiple store invocations whenever in transaction. For example,
+ * if using JDBC, you can store the ongoing database connection in the session {@link #properties()} map.
+ * You can then commit this connection in the {@link CacheStore#txEnd(boolean)} method.
+ * <p>
+ * {@code CacheStoreSession} can be injected into an implementation of {@link CacheStore} with
+ * {@link CacheStoreSessionResource @CacheStoreSessionResource} annotation.
*
* @see CacheStoreSessionResource
*/
[05/37] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-311
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79572adb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79572adb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79572adb
Branch: refs/heads/ignite-239
Commit: 79572adb47bfd98033b39dea29d1eda8f989e288
Parents: 51acac6 f1ec719
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 13:48:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 13:48:40 2015 +0300
----------------------------------------------------------------------
README.md | 181 ++++++++++++++++++-
examples/pom-standalone.xml | 2 +-
.../java/org/apache/ignite/cache/GridCache.java | 48 -----
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 7 +-
.../processors/cache/GridCacheMapEntry.java | 12 +-
.../processors/cache/GridCacheProjectionEx.java | 47 +++++
.../cache/GridCacheProjectionImpl.java | 11 ++
.../processors/cache/GridCacheProxyImpl.java | 8 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../distributed/near/GridNearCacheAdapter.java | 8 +-
.../processors/query/GridQueryProcessor.java | 4 +-
.../core/src/main/resources/ignite.properties | 3 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 6 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
pom.xml | 2 +-
readme.md | 2 -
19 files changed, 274 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
[07/37] incubator-ignite git commit: Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Posted by sb...@apache.org.
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Conflicts:
README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/413b6c87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/413b6c87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/413b6c87
Branch: refs/heads/ignite-239
Commit: 413b6c87ddc422d41f95b757c079a08d97b7cb26
Parents: 5a287b1 f1ec719
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 14:03:47 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 14:03:47 2015 +0300
----------------------------------------------------------------------
README.md | 179 +++++++++++++++++++
.../processors/cache/GridCacheMapEntry.java | 12 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
4 files changed, 191 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[04/37] incubator-ignite git commit: #ignite-311: move version from
plugin to plugin configuration.
Posted by sb...@apache.org.
#ignite-311: move version from plugin to plugin configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51acac6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51acac6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51acac6b
Branch: refs/heads/ignite-239
Commit: 51acac6bbf338d083310507b6975a1724c141d7e
Parents: da5f520
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 13:47:59 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 13:47:59 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 31 ++++++++------------
.../org/apache/ignite/plugin/IgnitePlugin.java | 5 +---
.../ignite/plugin/PluginConfiguration.java | 10 +++++++
3 files changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51acac6b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index acb5131..922c20b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -454,8 +454,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
- @Override public String apply(Map.Entry<String,?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
+ @Override
+ public String apply(Map.Entry<String, ?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
@@ -608,7 +609,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
RuntimeMXBean rtBean = ManagementFactory.getRuntimeMXBean();
// Ack various information.
- ackAsciiLogo(false);
+ ackAsciiLogo();
ackConfigUrl();
ackDaemon();
ackOsInfo();
@@ -772,8 +773,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
provider.start(ctx.plugins().pluginContextForProvider(provider), attrs);
}
- ackAsciiLogo(true);
-
gw.writeLock();
try {
@@ -1524,10 +1523,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/**
* Acks ASCII-logo. Thanks to http://patorjk.com/software/taag
- *
- * @param pluginInfo Whether print plugin information or not.
- */
- private void ackAsciiLogo(boolean pluginInfo) {
+ */
+ private void ackAsciiLogo() {
assert log != null;
String fileName = log.fileName();
@@ -1546,7 +1543,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
" ",
ver,
COPYRIGHT,
- pluginInfo ? pluginInfo() : "",
+ pluginInfo(),
"",
"Quiet mode.");
@@ -1565,10 +1562,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
">>> " + NL +
">>> " + ver + NL +
- ">>> " + COPYRIGHT + NL;
-
- if (pluginInfo)
- info += ">>> " + pluginInfo();
+ ">>> " + COPYRIGHT + NL +
+ ">>> " + pluginInfo();
if (log.isInfoEnabled())
log.info(info);
@@ -1576,15 +1571,15 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
private String pluginInfo() {
- Collection<PluginProvider> pluginProviders = ctx.plugins().allProviders();
+ Collection<? extends PluginConfiguration> pluginsCfg = cfg.getPluginConfigurations();
- if (pluginProviders.size() == 0)
+ if (pluginsCfg.size() == 0)
return PLUGIN_INFO + "none";
String info = PLUGIN_INFO + NL;
- for (PluginProvider provider : pluginProviders)
- info += provider.plugin().name() + " " + provider.plugin().version() + NL;
+ for (PluginConfiguration cfg : pluginsCfg)
+ info += cfg.name() + " " + cfg.version() + NL;
return info;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51acac6b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
index 020252d..6a928af 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
@@ -24,8 +24,5 @@ package org.apache.ignite.plugin;
* @version @java.version
*/
public interface IgnitePlugin {
-
- public String name();
-
- public String version();
+ // No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51acac6b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
index f30e897..9323d6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
@@ -28,4 +28,14 @@ public interface PluginConfiguration {
* @return Plugin provider class.
*/
public Class<? extends PluginProvider> providerClass();
+
+ /**
+ * @return Plugin name.
+ */
+ public String name();
+
+ /**
+ * @return Plugin version.
+ */
+ public String version();
}
[16/37] incubator-ignite git commit: #ignite-311: move version to
PluginProvider
Posted by sb...@apache.org.
#ignite-311: move version to PluginProvider
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4397d229
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4397d229
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4397d229
Branch: refs/heads/ignite-239
Commit: 4397d2296c0575c23f52be4f18f32f38997066f8
Parents: a96bb10
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 18:59:31 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 18:59:31 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 69 +++++++++++---------
.../ignite/plugin/PluginConfiguration.java | 15 -----
.../apache/ignite/plugin/PluginProvider.java | 5 ++
3 files changed, 43 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4397d229/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 7e9427d..1a084aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -708,6 +708,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
startProcessor(ctx, new IgnitePluginProcessor(ctx, cfg), attrs);
+ ackPluginsInfo();
+
// Off-heap processor has no dependencies.
startProcessor(ctx, new GridOffHeapProcessor(ctx), attrs);
@@ -1534,18 +1536,16 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Big thanks to: http://patorjk.com/software/taag
// Font name "Small Slant"
if (log.isQuiet()) {
- List<String> info = new ArrayList<>();
- info.add(" __________ ________________ ");
- info.add(" / _/ ___/ |/ / _/_ __/ __/ ");
- info.add(" _/ // (7 7 // / / / / _/ ");
- info.add("/___/\\___/_/|_/___/ /_/ /___/ ");
- info.add(" ");
- info.add(COPYRIGHT);
- info.addAll(Arrays.asList(pluginInfo().split(NL + ">>> ")));
- info.add("");
- info.add("Quiet mode.");
-
- U.quiet(false, info.toArray(new String[info.size()]));
+ U.quiet(false,
+ " __________ ________________ ",
+ " / _/ ___/ |/ / _/_ __/ __/ ",
+ " _/ // (7 7 // / / / / _/ ",
+ "/___/\\___/_/|_/___/ /_/ /___/ ",
+ " ",
+ ver,
+ COPYRIGHT,
+ "",
+ "Quiet mode.");
if (fileName != null)
U.quiet(false, " ^-- Logging to file '" + fileName + '\'');
@@ -1555,36 +1555,43 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
"");
}
- String info = NL + NL +
- ">>> __________ ________________ " + NL +
- ">>> / _/ ___/ |/ / _/_ __/ __/ " + NL +
- ">>> _/ // (7 7 // / / / / _/ " + NL +
- ">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
- ">>> " + NL +
- ">>> " + ver + NL +
- ">>> " + COPYRIGHT + NL +
- ">>> " + pluginInfo();
-
- if (log.isInfoEnabled())
- log.info(info);
+ if (log.isInfoEnabled()) {
+ log.info(NL + NL +
+ ">>> __________ ________________ " + NL +
+ ">>> / _/ ___/ |/ / _/_ __/ __/ " + NL +
+ ">>> _/ // (7 7 // / / / / _/ " + NL +
+ ">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
+ ">>> " + NL +
+ ">>> " + ver + NL +
+ ">>> " + COPYRIGHT + NL
+ );
+ }
}
}
private String pluginInfo() {
- Collection<? extends PluginConfiguration> pluginsCfg = cfg.getPluginConfigurations();
+ Collection<PluginProvider> plugins = ctx.plugins().allProviders();
- if (pluginsCfg.size() == 0)
- return PLUGIN_INFO + "none";
+ if (plugins.size() == 0)
+ return NL + ">>> " + PLUGIN_INFO + "none";
- String info = PLUGIN_INFO + NL;
+ String info = NL + ">>> " + PLUGIN_INFO + NL;
- for (PluginConfiguration cfg : pluginsCfg)
- info += ">>> " + cfg.name() + " " + cfg.version() + NL +
- ">>> " + cfg.copyright();
+ for (PluginProvider plugin : plugins)
+ info += ">>> " + plugin.name() + " " + plugin.version() + NL +
+ ">>> " + plugin.copyright();
return info;
}
+ private void ackPluginsInfo() {
+ if (log.isQuiet())
+ U.quiet(false, pluginInfo().split(NL + ">>> "));
+
+ if (log.isInfoEnabled())
+ log.info(">>> " + pluginInfo());
+ }
+
/**
* Prints start info.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4397d229/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
index 568f1ab..f30e897 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
@@ -28,19 +28,4 @@ public interface PluginConfiguration {
* @return Plugin provider class.
*/
public Class<? extends PluginProvider> providerClass();
-
- /**
- * @return Plugin name.
- */
- public String name();
-
- /**
- * @return Plugin version.
- */
- public String version();
-
- /**
- * @return Copyright.
- */
- public String copyright();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4397d229/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
index 41b7216..e41d6f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java
@@ -41,6 +41,11 @@ public interface PluginProvider<C extends PluginConfiguration> {
public String version();
/**
+ * @return Copyright.
+ */
+ public String copyright();
+
+ /**
* @return Plugin API.
*/
public <T extends IgnitePlugin> T plugin();
[17/37] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-311
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6accc24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6accc24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6accc24
Branch: refs/heads/ignite-239
Commit: c6accc246544f748dea437a74bb7c1fb7af07e3a
Parents: 4397d22 36e9236
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 19:00:00 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 19:00:00 2015 +0300
----------------------------------------------------------------------
bin/setup-hadoop.sh | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheUtils.java | 18 +++++++++++++
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 28 +++++++-------------
.../GridCacheAbstractJobExecutionTest.java | 15 ++++-------
modules/hadoop/pom.xml | 6 -----
7 files changed, 35 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[34/37] incubator-ignite git commit: # sprint-2 - fixing comments.
Posted by sb...@apache.org.
# sprint-2 - fixing comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3a77acf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3a77acf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3a77acf7
Branch: refs/heads/ignite-239
Commit: 3a77acf759cd30bbb7bdcb51ab8e1bcecb273639
Parents: 16105ec
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 09:49:15 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 09:49:15 2015 -0800
----------------------------------------------------------------------
.../ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3a77acf7/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 0473280..55ba1a7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -131,7 +131,8 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
int updated;
- // Try update first.
+ // Try update first. If it does not work, then try insert.
+ // Some databases would allow these to be done in one 'upsert' operation.
try (PreparedStatement st = conn.prepareStatement(
"update PERSONS set firstName=?, lastName=? where id=?")) {
st.setString(1, val.getFirstName());
[30/37] incubator-ignite git commit: # sprint-2 - Fixed warning in
example.
Posted by sb...@apache.org.
# sprint-2 - Fixed warning in example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/375376b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/375376b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/375376b6
Branch: refs/heads/ignite-239
Commit: 375376b68ccb9e8d83746f6eeac49a6388396012
Parents: a792c99
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Fri Feb 27 23:50:04 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Fri Feb 27 23:50:04 2015 -0500
----------------------------------------------------------------------
.../examples/datagrid/store/CacheNodeWithStoreStartup.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/375376b6/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
index 0c87f84..5245f98 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
@@ -64,19 +64,19 @@ public class CacheNodeWithStoreStartup {
discoSpi.setIpFinder(ipFinder);
- CacheConfiguration cacheCfg = new CacheConfiguration();
+ CacheConfiguration<Long, Person> cacheCfg = new CacheConfiguration<>();
// Set atomicity as transaction, since we are showing transactions in example.
cacheCfg.setAtomicityMode(TRANSACTIONAL);
- CacheStore store;
+ CacheStore<Long, Person> store;
// Uncomment other cache stores to try them.
store = new CacheDummyPersonStore();
// store = new CacheJdbcPersonStore();
// store = new CacheHibernatePersonStore();
- cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
+ cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory<>(store));
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
[32/37] incubator-ignite git commit: # sprint-2 - exception fix.
Posted by sb...@apache.org.
# sprint-2 - exception fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6097e7bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6097e7bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6097e7bf
Branch: refs/heads/ignite-239
Commit: 6097e7bfc3af49296b50017d5661d313aaa3db80
Parents: a14ef18
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 00:29:42 2015 -0500
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 00:29:42 2015 -0500
----------------------------------------------------------------------
.../examples/datagrid/store/jdbc/CacheJdbcPersonStore.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6097e7bf/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 6388fbf..d80861d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -92,7 +92,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
}
/** {@inheritDoc} */
- @Nullable @Override public Person load(Long key) {
+ @Override public Person load(Long key) {
Transaction tx = transaction();
System.out.println(">>> Store load [key=" + key + ", xid=" + (tx == null ? null : tx.xid()) + ']');
@@ -185,7 +185,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
}
}
catch (SQLException e) {
- throw new CacheLoaderException("Failed to remove object: " + key, e);
+ throw new CacheWriterException("Failed to remove object: " + key, e);
}
finally {
end(tx, conn);
@@ -302,7 +302,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> {
/**
* @return Current transaction.
*/
- @Nullable private Transaction transaction() {
+ private Transaction transaction() {
return ses != null ? ses.transaction() : null;
}
}
[13/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5eeb8a2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5eeb8a2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5eeb8a2a
Branch: refs/heads/ignite-239
Commit: 5eeb8a2a578d77d648977dc58b7588da5e6df6fc
Parents: 63c3f54
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 15:15:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 15:15:40 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 2 +-
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eeb8a2a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 72ab928..1dfee9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1875,7 +1875,7 @@ public class IgniteConfiguration {
* @return Plugin configurations.
*/
public Collection<? extends PluginConfiguration> getPluginConfigurations() {
- return pluginCfgs;
+ return pluginCfgs == null ? Collections.<PluginConfiguration>emptyList() : pluginCfgs;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5eeb8a2a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index ceca4a7..2b6e832 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1541,7 +1541,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
info.add("/___/\\___/_/|_/___/ /_/ /___/ ");
info.add(" ");
info.add(COPYRIGHT);
- info.addAll(Arrays.asList(pluginInfo().split(NL)));
+ info.addAll(Arrays.asList(pluginInfo().split(NL + ">>> ")));
info.add("");
info.add("Quiet mode.");
@@ -1579,7 +1579,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String info = PLUGIN_INFO + NL;
for (PluginConfiguration cfg : pluginsCfg)
- info += cfg.name() + " " + cfg.version() + NL;
+ info += ">>> " + cfg.name() + " " + cfg.version() + NL;
return info;
}
[20/37] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-311
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6d95f8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6d95f8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6d95f8e
Branch: refs/heads/ignite-239
Commit: d6d95f8e960809a359500e9b1da4dfc9ae03bbca
Parents: 51b8ae5 4e57996
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 26 11:47:56 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 26 11:47:56 2015 +0300
----------------------------------------------------------------------
README.md | 179 --
.../hibernate/example-hibernate-L2-cache.xml | 2 +-
.../ComputeFibonacciContinuationExample.java | 17 +-
.../examples/datagrid/CacheApiExample.java | 4 +-
.../datagrid/CacheContinuousQueryExample.java | 6 +-
.../examples/datagrid/CacheQueryExample.java | 2 +-
.../IgniteCountDownLatchExample.java | 3 +-
.../MessagingPingPongListenActorExample.java | 3 +-
.../examples/ScalarContinuationExample.scala | 20 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 10 +-
.../internal/client/ClientStartNodeTask.java | 5 +-
.../ClientAbstractMultiNodeSelfTest.java | 2 +-
.../processors/rest/RestProcessorTest.java | 8 +-
.../processors/rest/TestBinaryClient.java | 1 -
.../processors/rest/TestMemcacheClient.java | 13 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 161 +-
.../java/org/apache/ignite/IgniteCache.java | 69 +
.../java/org/apache/ignite/IgniteCluster.java | 3 +-
.../apache/ignite/IgniteSystemProperties.java | 5 +
.../ignite/cache/IgniteEntryProcessor.java | 28 +
.../CacheRendezvousAffinityFunction.java | 1 +
.../cache/store/jdbc/CacheJdbcPojoStore.java | 28 +-
.../ignite/cluster/ClusterNodeLocalMap.java | 60 -
.../ignite/events/DiscoveryCustomEvent.java | 56 +
.../org/apache/ignite/events/EventType.java | 12 +
.../IgfsByteDelimiterRecordResolver.java | 1 +
.../ignite/internal/ClusterMetricsSnapshot.java | 9 +-
.../internal/GridEventConsumeHandler.java | 1 +
.../ignite/internal/GridJobCancelRequest.java | 26 +-
.../ignite/internal/GridJobExecuteRequest.java | 70 +-
.../ignite/internal/GridJobExecuteResponse.java | 34 +-
.../ignite/internal/GridJobSiblingsRequest.java | 24 +-
.../internal/GridJobSiblingsResponse.java | 22 +-
.../ignite/internal/GridKernalContext.java | 16 +-
.../ignite/internal/GridKernalContextImpl.java | 23 +-
.../internal/GridMessageListenHandler.java | 1 +
.../ignite/internal/GridTaskCancelRequest.java | 22 +-
.../ignite/internal/GridTaskSessionRequest.java | 26 +-
.../apache/ignite/internal/IgniteKernal.java | 11 +-
.../cluster/ClusterNodeLocalMapImpl.java | 27 +-
.../cluster/IgniteClusterAsyncImpl.java | 3 +-
.../internal/cluster/IgniteClusterImpl.java | 4 +-
.../internal/direct/DirectByteBufferStream.java | 44 +-
.../internal/direct/DirectMessageReader.java | 33 +-
.../internal/direct/DirectMessageWriter.java | 23 +-
.../direct/DirectMessageWriterState.java | 13 +-
.../igfs/common/IgfsControlResponse.java | 1 +
.../internal/igfs/common/IgfsMarshaller.java | 1 +
.../internal/managers/GridManagerAdapter.java | 9 +-
.../checkpoint/GridCheckpointRequest.java | 26 +-
.../managers/communication/GridIoManager.java | 30 +-
.../managers/communication/GridIoMessage.java | 38 +-
.../communication/GridIoMessageFactory.java | 33 +-
.../communication/GridIoUserMessage.java | 38 +-
.../deployment/GridDeploymentCommunication.java | 4 +-
.../deployment/GridDeploymentInfoBean.java | 35 +-
.../deployment/GridDeploymentRequest.java | 34 +-
.../deployment/GridDeploymentResponse.java | 26 +-
.../discovery/GridDiscoveryManager.java | 104 +-
.../eventstorage/GridEventStorageMessage.java | 42 +-
.../affinity/GridAffinityMessage.java | 1 +
.../processors/cache/GridCacheEntryInfo.java | 5 +-
.../cache/GridCacheEvictionRequest.java | 26 +-
.../cache/GridCacheEvictionResponse.java | 30 +-
.../processors/cache/GridCacheMapEntry.java | 562 ++--
.../processors/cache/GridCacheMessage.java | 21 +-
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheUtils.java | 4 +
.../processors/cache/GridCacheValueBytes.java | 24 +-
.../processors/cache/IgniteCacheProxy.java | 63 +
...idCacheOptimisticCheckPreparedTxRequest.java | 30 +-
...dCacheOptimisticCheckPreparedTxResponse.java | 26 +-
.../distributed/GridCacheTtlUpdateRequest.java | 58 +-
.../distributed/GridDistributedBaseMessage.java | 33 +-
.../distributed/GridDistributedLockRequest.java | 52 +-
.../GridDistributedLockResponse.java | 30 +-
.../GridDistributedTxFinishRequest.java | 42 +-
.../GridDistributedTxFinishResponse.java | 24 +-
.../GridDistributedTxPrepareRequest.java | 58 +-
.../GridDistributedTxPrepareResponse.java | 24 +-
.../GridDistributedTxRemoteAdapter.java | 66 +-
.../GridDistributedUnlockRequest.java | 26 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 22 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 24 +-
.../distributed/dht/GridDhtLockRequest.java | 42 +-
.../distributed/dht/GridDhtLockResponse.java | 40 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 42 +-
.../dht/GridDhtTxFinishResponse.java | 22 +-
.../dht/GridDhtTxPrepareRequest.java | 48 +-
.../dht/GridDhtTxPrepareResponse.java | 42 +-
.../distributed/dht/GridDhtUnlockRequest.java | 26 +-
.../dht/atomic/GridDhtAtomicCache.java | 44 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 26 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 92 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 32 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +-
.../atomic/GridNearAtomicUpdateResponse.java | 54 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 32 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 32 +-
.../GridDhtPartitionDemandMessage.java | 36 +-
.../preloader/GridDhtPartitionExchangeId.java | 27 +-
.../GridDhtPartitionSupplyMessage.java | 40 +-
.../GridDhtPartitionsAbstractMessage.java | 19 +-
.../preloader/GridDhtPartitionsFullMessage.java | 24 +-
.../GridDhtPartitionsSingleMessage.java | 22 +-
.../GridDhtPartitionsSingleRequest.java | 18 +-
.../distributed/near/GridNearAtomicCache.java | 3 -
.../distributed/near/GridNearGetRequest.java | 47 +-
.../distributed/near/GridNearGetResponse.java | 38 +-
.../distributed/near/GridNearLockRequest.java | 52 +-
.../distributed/near/GridNearLockResponse.java | 42 +-
.../near/GridNearTxFinishRequest.java | 32 +-
.../near/GridNearTxFinishResponse.java | 26 +-
.../near/GridNearTxPrepareRequest.java | 44 +-
.../near/GridNearTxPrepareResponse.java | 48 +-
.../distributed/near/GridNearUnlockRequest.java | 18 +-
.../query/GridCacheDistributedQueryManager.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../cache/query/GridCacheQueryRequest.java | 58 +-
.../cache/query/GridCacheQueryResponse.java | 40 +-
.../continuous/CacheContinuousQueryEntry.java | 1 +
.../continuous/CacheContinuousQueryHandler.java | 1 +
.../cache/transactions/IgniteTxAdapter.java | 58 +-
.../cache/transactions/IgniteTxEntry.java | 17 +-
.../transactions/IgniteTxLocalAdapter.java | 48 +-
.../version/GridCacheRawVersionedEntry.java | 1 +
.../cache/version/GridCacheVersion.java | 32 +-
.../GridCacheVersionConflictContext.java | 35 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../clock/GridClockDeltaSnapshotMessage.java | 28 +-
.../processors/clock/GridClockDeltaVersion.java | 24 +-
.../processors/clock/GridClockMessage.java | 1 +
.../closure/GridClosureProcessor.java | 82 +-
.../continuous/GridContinuousMessage.java | 28 +-
.../dataload/GridDataLoadRequest.java | 50 +-
.../dataload/GridDataLoadResponse.java | 26 +-
.../dataload/GridDataLoaderProcessor.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 6 +-
.../processors/igfs/IgfsAckMessage.java | 26 +-
.../internal/processors/igfs/IgfsBlockKey.java | 28 +-
.../processors/igfs/IgfsBlocksMessage.java | 30 +-
.../igfs/IgfsCommunicationMessage.java | 18 +-
.../processors/igfs/IgfsDataManager.java | 4 +-
.../processors/igfs/IgfsDeleteMessage.java | 24 +-
.../processors/igfs/IgfsFileAffinityRange.java | 30 +-
.../igfs/IgfsFragmentizerRequest.java | 28 +-
.../igfs/IgfsFragmentizerResponse.java | 22 +-
.../internal/processors/igfs/IgfsImpl.java | 6 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 4 +-
.../internal/processors/igfs/IgfsServer.java | 1 +
.../processors/igfs/IgfsSyncMessage.java | 24 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../plugin/IgnitePluginProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 85 +-
.../processors/rest/GridRestResponse.java | 1 +
.../message/GridClientAbstractMessage.java | 1 +
.../message/GridClientHandshakeRequest.java | 1 +
.../cache/GridCacheQueryCommandHandler.java | 7 +-
.../handlers/task/GridTaskResultRequest.java | 24 +-
.../handlers/task/GridTaskResultResponse.java | 28 +-
.../protocols/tcp/GridMemcachedMessage.java | 3 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 10 +-
.../securesession/GridSecureSession.java | 60 -
.../GridSecureSessionProcessor.java | 59 -
.../os/GridOsSecureSessionProcessor.java | 61 -
.../security/GridSecurityContext.java | 251 --
.../security/GridSecurityProcessor.java | 6 +-
.../processors/security/SecurityContext.java | 56 +
.../security/os/GridOsSecurityProcessor.java | 146 +-
.../streamer/GridStreamerCancelRequest.java | 22 +-
.../streamer/GridStreamerExecutionRequest.java | 38 +-
.../streamer/GridStreamerResponse.java | 24 +-
.../processors/streamer/IgniteStreamerImpl.java | 4 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../ignite/internal/util/GridByteArrayList.java | 24 +-
.../ignite/internal/util/GridLongList.java | 24 +-
.../internal/util/IgniteExceptionRegistry.java | 259 ++
.../ignite/internal/util/IgniteUtils.java | 2573 ++++++++----------
.../internal/util/ipc/IpcToNioAdapter.java | 4 +-
.../util/nio/GridCommunicationClient.java | 2 +-
.../nio/GridConnectionBytesVerifyFilter.java | 1 +
.../internal/util/nio/GridDirectParser.java | 33 +-
.../internal/util/nio/GridNioMessageReader.java | 2 +-
.../internal/util/nio/GridNioMessageWriter.java | 4 +-
.../ignite/internal/util/nio/GridNioServer.java | 59 +-
.../util/nio/GridShmemCommunicationClient.java | 2 +-
.../util/nio/GridTcpCommunicationClient.java | 3 +-
.../util/nio/GridTcpNioCommunicationClient.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 3 +-
.../VisorComputeToggleMonitoringTask.java | 4 +-
.../visor/node/VisorNodeDataCollectorJob.java | 4 +-
.../node/VisorNodeEventsCollectorTask.java | 3 +-
.../visor/query/VisorQueryCleanupTask.java | 4 +-
.../visor/query/VisorQueryNextPageTask.java | 6 +-
.../internal/visor/query/VisorQueryTask.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 45 +-
.../ignite/lang/IgniteProductVersion.java | 1 +
.../optimized/optimized-classnames.properties | 3 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 6 +
.../extensions/communication/Message.java | 58 +
.../communication/MessageAdapter.java | 143 -
.../MessageCollectionItemType.java | 101 +
.../communication/MessageFactory.java | 4 +-
.../communication/MessageFormatter.java | 3 +-
.../extensions/communication/MessageReader.java | 24 +-
.../extensions/communication/MessageWriter.java | 26 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 8 +
.../ignite/spi/IgniteSpiThreadFactory.java | 2 +-
.../jobstealing/JobStealingRequest.java | 22 +-
.../communication/tcp/TcpCommunicationSpi.java | 134 +-
.../ignite/spi/discovery/DiscoverySpi.java | 7 +
.../spi/discovery/DiscoverySpiListener.java | 11 +-
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 7 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 275 +-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 3 +
.../tcp/internal/TcpDiscoveryNode.java | 1 +
.../TcpDiscoveryMulticastIpFinder.java | 1 +
.../messages/TcpDiscoveryAuthFailedMessage.java | 1 +
.../TcpDiscoveryCustomEventMessage.java | 66 +
.../messages/TcpDiscoveryHeartbeatMessage.java | 1 +
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../internal/GridDiscoveryEventSelfTest.java | 43 +
.../internal/GridEventStorageSelfTest.java | 3 +-
.../GridJobMasterLeaveAwareSelfTest.java | 28 +-
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 4 +-
.../GridTaskContinuousMapperSelfTest.java | 3 +-
.../GridTaskExecutionContextSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 20 +-
.../GridCommunicationSendMessageSelfTest.java | 13 +-
.../communication/GridIoManagerSelfTest.java | 18 +-
.../GridDeploymentMessageCountSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 101 +-
.../GridCacheAtomicMessageCountSelfTest.java | 2 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 13 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 5 +-
...ridCacheReplicatedSynchronousCommitTest.java | 2 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 5 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 33 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 2 +-
...cheAtomicReferenceMultiNodeAbstractTest.java | 12 +-
.../GridCacheMultiNodeDataStructureTest.java | 3 +-
...dCacheSequenceMultiNodeAbstractSelfTest.java | 2 +-
...titionedAtomicSequenceMultiThreadedTest.java | 16 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 2 +-
.../GridCacheAtomicTimeoutSelfTest.java | 3 +-
.../distributed/GridCacheEventAbstractTest.java | 4 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 2 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 2 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 6 +-
.../dht/GridCacheDhtMultiBackupTest.java | 2 +-
.../GridCacheDhtPreloadMessageCountTest.java | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 3 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +-
.../near/IgniteCacheNearReadCommittedTest.java | 3 +
.../GridCacheReplicatedInvalidateSelfTest.java | 2 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 2 +-
.../IgniteCacheLoaderWriterAbstractTest.java | 47 +
.../closure/GridClosureProcessorSelfTest.java | 14 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 5 +-
.../igfs/IgfsDataManagerSelfTest.java | 1 +
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../streamer/GridStreamerEvictionSelfTest.java | 2 +-
.../streamer/GridStreamerSelfTest.java | 2 +-
.../util/IgniteExceptionRegistrySelfTest.java | 89 +
.../internal/util/IgniteUtilsSelfTest.java | 6 +-
.../internal/util/nio/GridRoundTripTest.java | 1 +
.../offheap/GridOffHeapMapAbstractSelfTest.java | 1 +
.../cache/GridCacheDataStructuresLoadTest.java | 36 +-
.../loadtests/cache/GridCacheLoadTest.java | 6 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 5 +-
.../loadtests/colocation/GridTestMain.java | 3 +-
.../communication/GridIoManagerBenchmark.java | 3 +-
.../communication/GridIoManagerBenchmark0.java | 6 +-
.../communication/GridTestMessage.java | 9 +-
.../GridMultiSplitsRedeployLoadTest.java | 5 +-
.../loadtests/discovery/GridGcTimeoutTest.java | 3 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 16 +-
.../job/GridJobExecutionSingleNodeLoadTest.java | 2 +-
.../mapper/GridContinuousMapperLoadTest1.java | 3 +-
.../loadtests/mapper/GridNodeStartup.java | 3 +-
.../mergesort/GridMergeSortLoadTest.java | 3 +-
.../streamer/GridStreamerIndexLoadTest.java | 4 +-
.../swap/GridSwapEvictAllBenchmark.java | 3 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 3 +-
.../GridSessionSetTaskAttributeSelfTest.java | 3 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 3 +-
.../GridAbstractCommunicationSelfTest.java | 22 +-
.../spi/communication/GridTestMessage.java | 25 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 2 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 16 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 4 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 22 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 10 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 10 +-
.../discovery/AbstractDiscoverySelfTest.java | 22 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 23 -
.../roundrobin/GridRoundRobinTestUtils.java | 6 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 1 +
.../index/GridStreamerIndexSelfTest.java | 17 +-
.../window/GridStreamerWindowSelfTest.java | 3 +-
.../testframework/GridSpiTestContext.java | 12 +-
.../junits/GridTestKernalContext.java | 2 +
.../ignite/testframework/junits/IgniteMock.java | 1 -
.../cache/GridAbstractCacheStoreSelfTest.java | 3 +-
.../junits/spi/GridSpiAbstractTest.java | 12 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +-
.../testsuites/IgniteUtilSelfTestSuite.java | 1 +
.../tests/p2p/GridP2PAwareTestUserResource.java | 5 +-
.../tests/p2p/GridTestMessageListener.java | 4 +-
modules/hadoop/pom.xml | 10 -
.../client/hadoop/GridHadoopClientProtocol.java | 3 +-
.../internal/igfs/hadoop/IgfsHadoopWrapper.java | 2 +-
.../hadoop/GridHadoopDefaultJobInfo.java | 5 +-
.../processors/hadoop/GridHadoopSetup.java | 3 +-
.../GridHadoopDefaultMapReducePlanner.java | 3 +-
.../shuffle/GridHadoopShuffleMessage.java | 1 +
.../taskexecutor/GridHadoopExecutorService.java | 2 +-
.../hadoop/v2/GridHadoopSplitWrapper.java | 3 +-
.../hadoop/GridHadoopGroupingTest.java | 10 +-
.../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +-
.../hadoop/GridHadoopSortingTest.java | 9 +-
.../processors/hadoop/GridHadoopStartup.java | 2 +-
.../ignite/loadtests/igfs/IgfsNodeStartup.java | 3 +-
...idHibernateAbstractRegionAccessStrategy.java | 97 -
.../GridHibernateAccessStrategyAdapter.java | 369 ---
.../GridHibernateCollectionRegion.java | 99 -
.../hibernate/GridHibernateEntityRegion.java | 110 -
.../GridHibernateGeneralDataRegion.java | 69 -
.../hibernate/GridHibernateNaturalIdRegion.java | 98 -
.../GridHibernateNonStrictAccessStrategy.java | 220 --
.../GridHibernateQueryResultsRegion.java | 71 -
.../GridHibernateReadOnlyAccessStrategy.java | 106 -
.../GridHibernateReadWriteAccessStrategy.java | 282 --
.../cache/hibernate/GridHibernateRegion.java | 101 -
.../hibernate/GridHibernateRegionFactory.java | 231 --
.../GridHibernateTimestampsRegion.java | 40 -
...ridHibernateTransactionalAccessStrategy.java | 139 -
.../GridHibernateTransactionalDataRegion.java | 96 -
.../HibernateAbstractRegionAccessStrategy.java | 97 +
.../HibernateAccessStrategyAdapter.java | 369 +++
.../hibernate/HibernateCollectionRegion.java | 99 +
.../cache/hibernate/HibernateEntityRegion.java | 110 +
.../hibernate/HibernateGeneralDataRegion.java | 69 +
.../hibernate/HibernateNaturalIdRegion.java | 98 +
.../HibernateNonStrictAccessStrategy.java | 220 ++
.../hibernate/HibernateQueryResultsRegion.java | 71 +
.../HibernateReadOnlyAccessStrategy.java | 106 +
.../HibernateReadWriteAccessStrategy.java | 282 ++
.../ignite/cache/hibernate/HibernateRegion.java | 101 +
.../cache/hibernate/HibernateRegionFactory.java | 231 ++
.../hibernate/HibernateTimestampsRegion.java | 40 +
.../HibernateTransactionalAccessStrategy.java | 139 +
.../HibernateTransactionalDataRegion.java | 96 +
.../apache/ignite/cache/hibernate/package.html | 2 +-
...idHibernateL2CacheConfigurationSelfTest.java | 393 ---
.../hibernate/GridHibernateL2CacheSelfTest.java | 1923 -------------
...idHibernateL2CacheTransactionalSelfTest.java | 135 -
.../HibernateL2CacheConfigurationSelfTest.java | 393 +++
.../hibernate/HibernateL2CacheSelfTest.java | 1925 +++++++++++++
.../HibernateL2CacheTransactionalSelfTest.java | 135 +
.../testsuites/IgniteHibernateTestSuite.java | 6 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../GridCacheCrossCacheQuerySelfTestNewApi.java | 2 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 2 +-
.../http/jetty/GridJettyRestHandler.java | 1 +
.../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +-
...gniteProjectionStartStopRestartSelfTest.java | 3 +-
pom.xml | 2 +-
379 files changed, 10408 insertions(+), 9496 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6d95f8e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
[26/37] incubator-ignite git commit: Merge branch 'ignite-322' into
sprint-2
Posted by sb...@apache.org.
Merge branch 'ignite-322' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a663f839
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a663f839
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a663f839
Branch: refs/heads/ignite-239
Commit: a663f8395668f6a473b63260a373776312f78154
Parents: b14be3b 96deb43
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 18:00:50 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 18:00:50 2015 +0300
----------------------------------------------------------------------
.../HibernateReadWriteAccessStrategy.java | 81 +++++++++++++++-----
1 file changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[18/37] incubator-ignite git commit: #ignite-311: add javadoc.
Posted by sb...@apache.org.
#ignite-311: add javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51e25c1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51e25c1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51e25c1b
Branch: refs/heads/ignite-239
Commit: 51e25c1b4108d147fae0628cd9e74ac0376893d4
Parents: c6accc2
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 19:02:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 19:02:40 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 2 +-
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51e25c1b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 1dfee9c..72ab928 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1875,7 +1875,7 @@ public class IgniteConfiguration {
* @return Plugin configurations.
*/
public Collection<? extends PluginConfiguration> getPluginConfigurations() {
- return pluginCfgs == null ? Collections.<PluginConfiguration>emptyList() : pluginCfgs;
+ return pluginCfgs;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51e25c1b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 1a084aa..7f8cd26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1569,6 +1569,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
}
+ /**
+ * Plugin information.
+ */
private String pluginInfo() {
Collection<PluginProvider> plugins = ctx.plugins().allProviders();
@@ -1584,6 +1587,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
return info;
}
+ /**
+ * Print plugin information.
+ */
private void ackPluginsInfo() {
if (log.isQuiet())
U.quiet(false, pluginInfo().split(NL + ">>> "));
[27/37] incubator-ignite git commit: Merge remote-tracking branch
'origin/sprint-2' into sprint-2
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f053746f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f053746f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f053746f
Branch: refs/heads/ignite-239
Commit: f053746ff8c6f4c03726706f74de7bda3e0a8468
Parents: a663f83 e1c0945
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 18:01:09 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 18:01:09 2015 +0300
----------------------------------------------------------------------
config/ignite-log4j.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[12/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63c3f549
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63c3f549
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63c3f549
Branch: refs/heads/ignite-239
Commit: 63c3f5494cb973c8c034a3ebc15a20a95d59cb7e
Parents: 81613b9
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 15:09:41 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 15:09:41 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/GridProperties.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63c3f549/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
index bf8f93e..89110af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
@@ -36,14 +36,15 @@ public class GridProperties {
static {
PROPS = new Properties();
- readProperties(FILE_PATH, true);
+ readProperties(FILE_PATH, PROPS, true);
}
/**
* @param path Path.
+ * @param props Properties.
* @param throwExc Flag indicating whether to throw an exception or not.
*/
- public static void readProperties(String path, boolean throwExc) {
+ public static void readProperties(String path, Properties props, boolean throwExc) {
try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
if (is == null) {
if (throwExc)
@@ -52,7 +53,7 @@ public class GridProperties {
return;
}
- PROPS.load(is);
+ props.load(is);
}
catch (IOException e) {
throw new RuntimeException("Failed to read properties file: " + path, e);
[35/37] incubator-ignite git commit: # sprint-2 - javadoc fixes.
Posted by sb...@apache.org.
# sprint-2 - javadoc fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/036bd715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/036bd715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/036bd715
Branch: refs/heads/ignite-239
Commit: 036bd71537630b082b747f518172da6ebfe11105
Parents: 3a77acf
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Sat Feb 28 19:05:42 2015 -0800
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Sat Feb 28 19:05:42 2015 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/cache/store/CacheStore.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/036bd715/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
index 848df39..eefcfb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java
@@ -119,7 +119,7 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> {
/**
* Loads all values from underlying persistent storage. Note that keys are not
* passed, so it is up to implementation to figure out what to load. This method
- * is called whenever {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)}
+ * is called whenever {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)}
* method is invoked which is usually to preload the cache from persistent storage.
* <p>
* This method is optional, and cache implementation does not depend on this
@@ -132,7 +132,7 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> {
*
* @param clo Closure for loaded values.
* @param args Arguments passes into
- * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method.
+ * {@link org.apache.ignite.IgniteCache#loadCache(IgniteBiPredicate, Object...)} method.
* @throws CacheLoaderException If loading failed.
*/
public void loadCache(IgniteBiInClosure<K, V> clo, @Nullable Object... args) throws CacheLoaderException;
[02/37] incubator-ignite git commit: #ignite-311: Output plugin's
information.
Posted by sb...@apache.org.
#ignite-311: Output plugin's information.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ad3bcad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ad3bcad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ad3bcad
Branch: refs/heads/ignite-239
Commit: 1ad3bcad975c049f3c306f580e685cf374044abc
Parents: 446192f
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 19 18:56:14 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 19 18:56:14 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 53 ++++++++++++++------
.../org/apache/ignite/plugin/IgnitePlugin.java | 5 +-
2 files changed, 43 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ad3bcad/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index e352099..acb5131 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -106,6 +106,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** Ignite site that is shown in log messages. */
static final String SITE = "www.gridgain.com";
+ /** Plugin information. */
+ public static final String PLUGIN_INFO = "Configured plugins: ";
+
/** System line separator. */
private static final String NL = U.nl();
@@ -605,7 +608,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
RuntimeMXBean rtBean = ManagementFactory.getRuntimeMXBean();
// Ack various information.
- ackAsciiLogo();
+ ackAsciiLogo(false);
ackConfigUrl();
ackDaemon();
ackOsInfo();
@@ -769,6 +772,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
provider.start(ctx.plugins().pluginContextForProvider(provider), attrs);
}
+ ackAsciiLogo(true);
+
gw.writeLock();
try {
@@ -1519,8 +1524,10 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/**
* Acks ASCII-logo. Thanks to http://patorjk.com/software/taag
- */
- private void ackAsciiLogo() {
+ *
+ * @param pluginInfo Whether print plugin information or not.
+ */
+ private void ackAsciiLogo(boolean pluginInfo) {
assert log != null;
String fileName = log.fileName();
@@ -1539,6 +1546,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
" ",
ver,
COPYRIGHT,
+ pluginInfo ? pluginInfo() : "",
"",
"Quiet mode.");
@@ -1550,20 +1558,37 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
"");
}
- if (log.isInfoEnabled()) {
- log.info(NL + NL +
- ">>> __________ ________________ " + NL +
- ">>> / _/ ___/ |/ / _/_ __/ __/ " + NL +
- ">>> _/ // (7 7 // / / / / _/ " + NL +
- ">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
- ">>> " + NL +
- ">>> " + ver + NL +
- ">>> " + COPYRIGHT + NL
- );
- }
+ String info = NL + NL +
+ ">>> __________ ________________ " + NL +
+ ">>> / _/ ___/ |/ / _/_ __/ __/ " + NL +
+ ">>> _/ // (7 7 // / / / / _/ " + NL +
+ ">>> /___/\\___/_/|_/___/ /_/ /___/ " + NL +
+ ">>> " + NL +
+ ">>> " + ver + NL +
+ ">>> " + COPYRIGHT + NL;
+
+ if (pluginInfo)
+ info += ">>> " + pluginInfo();
+
+ if (log.isInfoEnabled())
+ log.info(info);
}
}
+ private String pluginInfo() {
+ Collection<PluginProvider> pluginProviders = ctx.plugins().allProviders();
+
+ if (pluginProviders.size() == 0)
+ return PLUGIN_INFO + "none";
+
+ String info = PLUGIN_INFO + NL;
+
+ for (PluginProvider provider : pluginProviders)
+ info += provider.plugin().name() + " " + provider.plugin().version() + NL;
+
+ return info;
+ }
+
/**
* Prints start info.
*
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ad3bcad/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
index 6a928af..020252d 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/IgnitePlugin.java
@@ -24,5 +24,8 @@ package org.apache.ignite.plugin;
* @version @java.version
*/
public interface IgnitePlugin {
- // No-op.
+
+ public String name();
+
+ public String version();
}
[25/37] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-311
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ef2271b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ef2271b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ef2271b
Branch: refs/heads/ignite-239
Commit: 2ef2271b3f214db6143cd4166377c46f465449f8
Parents: 6e2ef56 e1c0945
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 17:56:34 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 17:56:34 2015 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 12 +
config/ignite-log4j.xml | 2 +-
.../datagrid/CacheContinuousQueryExample.java | 2 +-
ipc/shmem/Makefile.am | 15 +
ipc/shmem/igniteshmem/Makefile.am | 15 +
ipc/shmem/include/Makefile.am | 15 +
modules/clients/src/test/keystore/generate.sh | 15 +-
.../src/main/java/org/apache/ignite/Ignite.java | 4 +-
.../main/java/org/apache/ignite/IgniteFs.java | 2 +-
.../ignite/cache/query/ContinuousQuery.java | 18 +-
.../apache/ignite/cluster/ClusterMetrics.java | 2 +-
.../configuration/QueryConfiguration.java | 37 +-
.../ignite/events/DiscoveryCustomEvent.java | 56 -
.../org/apache/ignite/events/EventType.java | 14 +-
.../java/org/apache/ignite/igfs/IgfsMode.java | 6 +-
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../internal/events/DiscoveryCustomEvent.java | 71 +
.../discovery/GridDiscoveryManager.java | 7 +-
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../cache/VisorCacheMetricsCollectorTask.java | 10 +-
.../visor/node/VisorBasicConfiguration.java | 17 -
.../node/VisorNodeEventsCollectorTask.java | 10 +-
.../internal/visor/node/VisorNodeGcTask.java | 10 +-
.../internal/visor/node/VisorNodePingTask.java | 10 +-
.../optimized-classnames.previous.properties | 15 +
.../optimized/optimized-classnames.properties | 1565 +-----------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../TcpDiscoveryCustomEventMessage.java | 3 +
.../internal/GridDiscoveryEventSelfTest.java | 9 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 8 +-
...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 ++
.../config/GridTestProperties.java | 10 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 1 +
modules/extdata/p2p/pom.xml | 6 -
.../client/hadoop/GridHadoopClientProtocol.java | 6 +-
.../hadoop/IgfsHadoopFileSystemWrapper.java | 412 +++++
.../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +-
.../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +-
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +-
.../hadoop/IgfsHadoopFileSystemWrapper.java | 413 -----
.../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +-
.../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +-
.../hadoop/GridHadoopClassLoader.java | 12 +-
.../processors/hadoop/GridHadoopSetup.java | 8 +-
.../processors/hadoop/GridHadoopUtils.java | 4 +-
.../collections/GridHadoopHashMultimapBase.java | 2 +-
.../GridHadoopExternalCommunication.java | 14 +-
.../hadoop/v1/GridHadoopV1MapTask.java | 6 +-
.../v2/GridHadoopV2JobResourceManager.java | 2 +-
.../GridHadoopClientProtocolSelfTest.java | 6 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +-
.../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +-
.../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +-
.../IgfsHadoopFileSystemAbstractSelfTest.java | 1 +
...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +-
.../hadoop/GridHadoopGroupingTest.java | 4 +-
.../igfs/IgfsPerformanceBenchmark.java | 9 +-
.../testsuites/IgniteHadoopTestSuite.java | 7 +-
modules/hibernate/pom.xml | 6 -
modules/indexing/pom.xml | 6 -
modules/jta/pom.xml | 6 -
modules/scalar/pom.xml | 6 -
modules/spring/pom.xml | 6 -
modules/visor-console/pom.xml | 7 -
.../commands/alert/VisorAlertCommand.scala | 8 +-
.../commands/cache/VisorCacheCommand.scala | 82 +-
.../config/VisorConfigurationCommand.scala | 140 +-
.../commands/disco/VisorDiscoveryCommand.scala | 2 +-
.../scala/org/apache/ignite/visor/visor.scala | 64 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 2 +-
modules/web/pom.xml | 6 -
modules/winservice/IgniteService.sln | 2 +-
.../IgniteService/IgniteService.csproj | 2 +-
.../config/benchmark-atomic-win.properties | 15 +
.../config/benchmark-atomic.properties | 15 +
.../config/benchmark-compute-win.properties | 15 +
.../config/benchmark-compute.properties | 15 +
.../config/benchmark-multicast.properties | 15 +
.../config/benchmark-query-win.properties | 15 +
.../yardstick/config/benchmark-query.properties | 15 +
.../config/benchmark-tx-win.properties | 15 +
.../yardstick/config/benchmark-tx.properties | 15 +
.../yardstick/config/benchmark-win.properties | 15 +
modules/yardstick/config/benchmark.properties | 15 +
pom.xml | 150 +-
86 files changed, 1280 insertions(+), 2405 deletions(-)
----------------------------------------------------------------------
[11/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/81613b93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81613b93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81613b93
Branch: refs/heads/ignite-239
Commit: 81613b931afca89bdfcc16efd2c941784837d5ee
Parents: 687b618
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 15:01:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 15:01:11 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81613b93/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 20b2cbb..ceca4a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -454,9 +454,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
- @Override
- public String apply(Map.Entry<String, ?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
+ @Override public String apply(Map.Entry<String,?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
[19/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51b8ae51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51b8ae51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51b8ae51
Branch: refs/heads/ignite-239
Commit: 51b8ae51d24a7fca41f083794866eac30ec58a98
Parents: 51e25c1
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 19:09:50 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 19:09:50 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/IgniteKernal.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51b8ae51/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 7f8cd26..92bb202 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -454,8 +454,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
- @Override public String apply(Map.Entry<String,?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
+ @Override
+ public String apply(Map.Entry<String, ?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
@@ -1595,7 +1596,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
U.quiet(false, pluginInfo().split(NL + ">>> "));
if (log.isInfoEnabled())
- log.info(">>> " + pluginInfo());
+ log.info(pluginInfo());
}
/**
[06/37] incubator-ignite git commit: #ignite-311: delete readme.mdf
Posted by sb...@apache.org.
#ignite-311: delete readme.mdf
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a287b16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a287b16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a287b16
Branch: refs/heads/ignite-239
Commit: 5a287b164aa05af22fb41ef6206f91312ee43731
Parents: 1b62cf4
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 14:03:00 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 14:03:00 2015 +0300
----------------------------------------------------------------------
README.md | 2 -
readme.md | 179 ---------------------------------------------------------
2 files changed, 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a287b16/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
deleted file mode 100644
index 2cc2f0d..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-ignite-test
-===========
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a287b16/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
deleted file mode 100644
index f1b9b05..0000000
--- a/readme.md
+++ /dev/null
@@ -1,179 +0,0 @@
-<center>
-
-</center>
-
-Apache Ignite In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies.
-
-
-##Features
-You can view Ignite as a collection of independent, well-integrated, in-memory components geared to improve performance and scalability of you application. Some of these components include:
-
- * Advanced Clustering
- * Compute Grid
- * Data Grid (JCache)
- * Service Grid
- * Ignite File System
- * Distributed Data Structures
- * Distributed Messaging
- * Distributed Events
- * Streaming & CEP
- * In-Memory Hadoop Accelerator
-
-## Installation
-Here is the quick summary on installation of Apache Ignite:
- * Download Apache Ignite as ZIP archive from https://ignite.incubator.apache.org/
- * Unzip ZIP archive into the installation folder in your system
- * Set `IGNITE_HOME` environment variable to point to the installation folder and make sure there is no trailing `/` in the path (this step is optional)
-
-## Start From Command Line
-An Ignite node can be started from command line either with default configuration or by passing a configuration file. You can start as many nodes as you like and they will all automatically discover each other.
-
-### With Default Configuration
-To start a grid node with default configuration, open the command shell and, assuming you are in `IGNITE_HOME` (Ignite installation folder), just type this:
-
- $ bin/ignite.sh
-
-and you will see the output similar to this:
-
- [02:49:12] Ignite node started OK (id=ab5d18a6)
- [02:49:12] Topology snapshot [ver=1, nodes=1, CPUs=8, heap=1.0GB]
-
-By default `ignite.sh` starts Ignite node with the default configuration: `config/default-config.xml`.
-
-### Passing Configuration File
-To pass configuration file explicitly, from command line, you can type ggstart.sh <path to configuration file> from within your Ignite installation folder. For example:
-
- $ bin/ignite.sh examples/config/example-cache.xml
-
-Path to configuration file can be absolute, or relative to either `IGNITE_HOME` (Ignite installation folder) or `META-INF` folder in your classpath.
-
-### Interactive Mode
-To pick a configuration file in interactive mode just pass `-i` flag, like so: `ignite.sh -i`.
-
-## Get It With Maven
-Another easy way to get started with Apache Ignite in your project is to use Maven 2 dependency management.
-
-Ignite requires only one `ignite-core` mandatory dependency. Usually you will also need to add `ignite-spring` for spring-based XML configuration and `ignite-indexing` for SQL querying.
-
-Replace `${ignite-version}` with actual Ignite version.
-
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-core</artifactId>
- <version>${ignite.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-spring</artifactId>
- <version>${ignite.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-indexing</artifactId>
- <version>${ignite.version}</version>
- </dependency>
-
-## First Ignite Compute Application
-Let's write our first grid application which will count a number of non-white-space characters in a sentence. As an example, we will take a sentence, split it into multiple words, and have every compute job count number of characters in each individual word. At the end we simply add up results received from individual jobs to get our total count.
-
- try (Ignite ignite = Ignition.start()) {
- Collection<GridCallable<Integer>> calls = new ArrayList<>();
-
- // Iterate through all the words in the sentence and create Callable jobs.
- for (final String word : "Count characters using callable".split(" ")) {
- calls.add(new GridCallable<Integer>() {
- @Override public Integer call() throws Exception {
- return word.length();
- }
- });
- }
-
- // Execute collection of Callables on the grid.
- Collection<Integer> res = ignite.compute().call(calls).get();
-
- int sum = 0;
-
- // Add up individual word lengths received from remote nodes.
- for (int len : res)
- sum += len;
-
- System.out.println(">>> Total number of characters in the phrase is '" + sum + "'.");
- }
-
-### Zero Deployment
-Note that when running above application from your IDE, remote nodes will execute received jobs without having your code on the class path. This is called Zero Deployment. Ignite automatically detects missing classes and loads class definitions from the nodes that have them.
-
-## First Ignite Data Grid Application
-Now let's write a simple set of mini-examples which will put and get values to/from distributed cache, and perform basic transactions.
-
-Since we are using cache in this example, we should make sure that it is configured. Let's use example configuration shipped with Ignite that already has several caches configured:
-
- $ bin/ignite.sh examples/config/example-cache.xml
-
-### Put and Get
-
- try (Ignite ignite = Ignition.start("examples/config/example-cache.xml")) {
- IgniteCache<Integer, String> cache = ignite.cache(CACHE_NAME);
-
- // Store keys in cache (values will end up on different cache nodes).
- for (int i = 0; i < 10; i++)
- cache.put(i, Integer.toString(i));
-
- for (int i = 0; i < 10; i++)
- System.out.println("Got [key=" + i + ", val=" + cache.get(i) + ']');
- }
-
-### Atomic Operations
-
- // Put-if-absent which returns previous value.
- Integer oldVal = cache.getAndPutIfAbsent("Hello", 11);
-
- // Put-if-absent which returns boolean success flag.
- boolean success = cache.putIfAbsent("World", 22);
-
- // Replace-if-exists operation (opposite of getAndPutIfAbsent), returns previous value.
- oldVal = cache.getAndReplace("Hello", 11);
-
- // Replace-if-exists operation (opposite of putIfAbsent), returns boolean success flag.
- success = cache.getAndReplace("World", 22);
-
- // Replace-if-matches operation.
- success = cache.replace("World", 2, 22);
-
- // Remove-if-matches operation.
- success = cache.remove("Hello", 1);
-
-### Transactions
-
- try (Transaction tx = ignite.transactions().txStart()) {
- Integer hello = cache.get("Hello");
-
- if (hello == 1)
- cache.put("Hello", 11);
-
- cache.put("World", 22);
-
- tx.commit();
- }
-
-### Distributed Locks
-
- // Lock cache key "Hello".
- Lock lock = cache.lock("Hello");
-
- lock.lock();
-
- try {
- cache.put("Hello", 11);
- cache.put("World", 22);
- }
- finally {
- lock.unlock();
- }
-
-## Ignite Visor Admin Console
-The easiest way to examine the content of the data grid as well as perform a long list of other management and monitoring operations is to use Ignite Visor Command Line Utility.
-
-To start Visor simply run:
-
- $ bin/ignitevisorcmd.sh
\ No newline at end of file
[21/37] incubator-ignite git commit: #ignite-311: move askPluginsInfo
to IgnitePluginProcessor.
Posted by sb...@apache.org.
#ignite-311: move askPluginsInfo to IgnitePluginProcessor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/509d2d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/509d2d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/509d2d8a
Branch: refs/heads/ignite-239
Commit: 509d2d8aae37ac2da4030f84717ad4c993abbc0d
Parents: d6d95f8
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 26 11:54:45 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 26 11:54:45 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 34 ------------------
.../plugin/IgnitePluginProcessor.java | 37 ++++++++++++++++++++
2 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/509d2d8a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 97567c5..77df6f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -105,9 +105,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** Ignite site that is shown in log messages. */
static final String SITE = "www.gridgain.com";
- /** Plugin information. */
- public static final String PLUGIN_INFO = "Configured plugins: ";
-
/** System line separator. */
private static final String NL = U.nl();
@@ -714,8 +711,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
startProcessor(ctx, new IgnitePluginProcessor(ctx, cfg), attrs);
- ackPluginsInfo();
-
// Off-heap processor has no dependencies.
startProcessor(ctx, new GridOffHeapProcessor(ctx), attrs);
@@ -1575,35 +1570,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/**
- * Plugin information.
- */
- private String pluginInfo() {
- Collection<PluginProvider> plugins = ctx.plugins().allProviders();
-
- if (plugins.size() == 0)
- return NL + ">>> " + PLUGIN_INFO + "none";
-
- String info = NL + ">>> " + PLUGIN_INFO + NL;
-
- for (PluginProvider plugin : plugins)
- info += ">>> " + plugin.name() + " " + plugin.version() + NL +
- ">>> " + plugin.copyright();
-
- return info;
- }
-
- /**
- * Print plugin information.
- */
- private void ackPluginsInfo() {
- if (log.isQuiet())
- U.quiet(false, pluginInfo().split(NL + ">>> "));
-
- if (log.isInfoEnabled())
- log.info(pluginInfo());
- }
-
- /**
* Prints start info.
*
* @param rtBean Java runtime bean.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/509d2d8a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index 6502b5c..aca8fb8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -42,6 +42,9 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
/** */
private volatile Map<Class<?>, Object[]> extensions;
+ /** Plugin information. */
+ public static final String PLUGIN_INFO = "Configured plugins: ";
+
/**
*
* @param ctx Kernal context.
@@ -159,6 +162,11 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
}
/** {@inheritDoc} */
+ @Override public void start() throws IgniteCheckedException {
+ ackPluginsInfo();
+ }
+
+ /** {@inheritDoc} */
@Nullable @Override public DiscoveryDataExchangeType discoveryDataType() {
return DiscoveryDataExchangeType.PLUGIN;
}
@@ -198,6 +206,35 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
}
/**
+ * Plugin information.
+ */
+ private String pluginInfo() {
+ Collection<PluginProvider> plugins = ctx.plugins().allProviders();
+
+ if (plugins.size() == 0)
+ return U.nl() + ">>> " + PLUGIN_INFO + "none";
+
+ String info = U.nl() + ">>> " + PLUGIN_INFO + U.nl();
+
+ for (PluginProvider plugin : plugins)
+ info += ">>> " + plugin.name() + " " + plugin.version() + U.nl() +
+ ">>> " + plugin.copyright();
+
+ return info;
+ }
+
+ /**
+ * Print plugin information.
+ */
+ private void ackPluginsInfo() {
+ if (log.isQuiet())
+ U.quiet(false, pluginInfo().split(U.nl() + ">>> "));
+
+ if (log.isInfoEnabled())
+ log.info(pluginInfo());
+ }
+
+ /**
*
*/
private static class ExtensionRegistryImpl implements ExtensionRegistry {
[10/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/687b618e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/687b618e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/687b618e
Branch: refs/heads/ignite-239
Commit: 687b618efc653e5129a1d04c7b3f42fde556c155
Parents: 3157a6c
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 14:59:41 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 14:59:41 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 28 +++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/687b618e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index abdbf76..20b2cbb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -454,8 +454,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
- @Override public String apply(Map.Entry<String,?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
+ @Override
+ public String apply(Map.Entry<String, ?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
@@ -1534,17 +1535,18 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Big thanks to: http://patorjk.com/software/taag
// Font name "Small Slant"
if (log.isQuiet()) {
- U.quiet(false,
- " __________ ________________ ",
- " / _/ ___/ |/ / _/_ __/ __/ ",
- " _/ // (7 7 // / / / / _/ ",
- "/___/\\___/_/|_/___/ /_/ /___/ ",
- " ",
- ver,
- COPYRIGHT,
- pluginInfo(),
- "",
- "Quiet mode.");
+ List<String> info = new ArrayList<>();
+ info.add(" __________ ________________ ");
+ info.add(" / _/ ___/ |/ / _/_ __/ __/ ");
+ info.add(" _/ // (7 7 // / / / / _/ ");
+ info.add("/___/\\___/_/|_/___/ /_/ /___/ ");
+ info.add(" ");
+ info.add(COPYRIGHT);
+ info.addAll(Arrays.asList(pluginInfo().split(NL)));
+ info.add("");
+ info.add("Quiet mode.");
+
+ U.quiet(false, info.toArray(new String[info.size()]));
if (fileName != null)
U.quiet(false, " ^-- Logging to file '" + fileName + '\'');
[09/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3157a6ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3157a6ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3157a6ce
Branch: refs/heads/ignite-239
Commit: 3157a6ce5d19a22bd9ce6ce95e9853bdd7c44a52
Parents: c7a7e44
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 14:09:19 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 14:09:19 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3157a6ce/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 922c20b..abdbf76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -454,9 +454,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
- @Override
- public String apply(Map.Entry<String, ?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
+ @Override public String apply(Map.Entry<String,?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
[37/37] incubator-ignite git commit: #ignite-239: small refactoring.
Posted by sb...@apache.org.
#ignite-239: small refactoring.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55669d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55669d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55669d46
Branch: refs/heads/ignite-239
Commit: 55669d46b838a1312e1067c8608243b89462fc54
Parents: ba010da
Author: ivasilinets <va...@gmail.com>
Authored: Sun Mar 1 15:39:37 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Sun Mar 1 15:39:37 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 172 +++++++++----------
1 file changed, 86 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55669d46/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index c7e7cb6..9770205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1295,29 +1295,14 @@ public class IgnitionEx {
private void start0(GridStartContext startCtx) throws IgniteCheckedException {
assert grid == null : "Grid is already started: " + name;
- // Set configuration URL, if any, into system property.
- if (startCtx.configUrl() != null)
- System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString());
-
IgniteConfiguration cfg = startCtx.config() != null ? startCtx.config() : new IgniteConfiguration();
- // Ensure invariant.
- // It's a bit dirty - but this is a result of late refactoring
- // and I don't want to reshuffle a lot of code.
- assert F.eq(name, cfg.getGridName());
-
- // Validate segmentation configuration.
- GridSegmentationPolicy segPlc = cfg.getSegmentationPolicy();
-
- // 1. Warn on potential configuration problem: grid is not configured to wait
- // for correct segment after segmentation happens.
- if (!F.isEmpty(cfg.getSegmentationResolvers()) && segPlc == RESTART_JVM && !cfg.isWaitForSegmentOnStart()) {
- U.warn(log, "Found potential configuration problem (forgot to enable waiting for segment" +
- "on start?) [segPlc=" + segPlc + ", wait=false]");
- }
-
IgniteConfiguration myCfg = initializeConfiguration(cfg);
+ // Set configuration URL, if any, into system property.
+ if (startCtx.configUrl() != null)
+ System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString());
+
// Ensure that SPIs support multiple grid instances, if required.
if (!startCtx.single()) {
ensureMultiInstanceSupport(myCfg.getDeploymentSpi());
@@ -1331,17 +1316,6 @@ public class IgnitionEx {
ensureMultiInstanceSupport(myCfg.getSwapSpaceSpi());
}
- try {
- // Use reflection to avoid loading undesired classes.
- Class helperCls = Class.forName("org.apache.ignite.util.GridConfigurationHelper");
-
- helperCls.getMethod("overrideConfiguration", IgniteConfiguration.class, Properties.class,
- String.class, IgniteLogger.class).invoke(helperCls, myCfg, System.getProperties(), name, log);
- }
- catch (Exception ignored) {
- // No-op.
- }
-
execSvc = new IgniteThreadPoolExecutor(
"pub-" + cfg.getGridName(),
cfg.getPublicThreadPoolSize(),
@@ -1414,6 +1388,17 @@ public class IgnitionEx {
// Register Ignite MBean for current grid instance.
registerFactoryMbean(myCfg.getMBeanServer());
+ try {
+ // Use reflection to avoid loading undesired classes.
+ Class helperCls = Class.forName("org.apache.ignite.util.GridConfigurationHelper");
+
+ helperCls.getMethod("overrideConfiguration", IgniteConfiguration.class, Properties.class,
+ String.class, IgniteLogger.class).invoke(helperCls, myCfg, System.getProperties(), name, log);
+ }
+ catch (Exception ignored) {
+ // No-op.
+ }
+
boolean started = false;
try {
@@ -1489,16 +1474,7 @@ public class IgnitionEx {
*/
private IgniteConfiguration initializeConfiguration(IgniteConfiguration cfg)
throws IgniteCheckedException {
- // Initialize factory's log.
- UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID();
-
- IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId);
-
- assert cfgLog != null;
-
- cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(nodeId));
-
- log = cfgLog.getLogger(G.class);
+ IgniteConfiguration myCfg = new IgniteConfiguration(cfg);
String ggHome = cfg.getIgniteHome();
@@ -1511,6 +1487,24 @@ public class IgnitionEx {
U.setWorkDirectory(cfg.getWorkDirectory(), ggHome);
+ // Ensure invariant.
+ // It's a bit dirty - but this is a result of late refactoring
+ // and I don't want to reshuffle a lot of code.
+ assert F.eq(name, cfg.getGridName());
+
+ UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID();
+
+ IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId);
+
+ assert cfgLog != null;
+
+ cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(nodeId));
+
+ // Initialize factory's log.
+ log = cfgLog.getLogger(G.class);
+
+ myCfg.setGridLogger(cfgLog);
+
// Check Ignite home folder (after log is available).
if (ggHome != null) {
File ggHomeFile = new File(ggHome);
@@ -1519,11 +1513,23 @@ public class IgnitionEx {
throw new IgniteCheckedException("Invalid Ignite installation home folder: " + ggHome);
}
- IgniteConfiguration myCfg = new IgniteConfiguration(cfg);
-
myCfg.setIgniteHome(ggHome);
- myCfg.setGridLogger(cfgLog);
+ // Validate segmentation configuration.
+ GridSegmentationPolicy segPlc = cfg.getSegmentationPolicy();
+
+ // 1. Warn on potential configuration problem: grid is not configured to wait
+ // for correct segment after segmentation happens.
+ if (!F.isEmpty(cfg.getSegmentationResolvers()) && segPlc == RESTART_JVM && !cfg.isWaitForSegmentOnStart()) {
+ U.warn(log, "Found potential configuration problem (forgot to enable waiting for segment" +
+ "on start?) [segPlc=" + segPlc + ", wait=false]");
+ }
+
+ myCfg.setTransactionConfiguration(myCfg.getTransactionConfiguration() != null ?
+ new TransactionConfiguration(myCfg.getTransactionConfiguration()) : null);
+
+ myCfg.setConnectorConfiguration(myCfg.getConnectorConfiguration() != null ?
+ new ConnectorConfiguration(myCfg.getConnectorConfiguration()) : null);
// Local host.
String locHost = IgniteSystemProperties.getString(IGNITE_LOCAL_HOST);
@@ -1534,6 +1540,37 @@ public class IgnitionEx {
if (daemon)
myCfg.setDaemon(true);
+ // Check for deployment mode override.
+ String depModeName = IgniteSystemProperties.getString(IGNITE_DEP_MODE_OVERRIDE);
+
+ if (!F.isEmpty(depModeName)) {
+ if (!F.isEmpty(myCfg.getCacheConfiguration())) {
+ U.quietAndInfo(log, "Skipping deployment mode override for caches (custom closure " +
+ "execution may not work for console Visor)");
+ }
+ else {
+ try {
+ DeploymentMode depMode = DeploymentMode.valueOf(depModeName);
+
+ if (myCfg.getDeploymentMode() != depMode)
+ myCfg.setDeploymentMode(depMode);
+ }
+ catch (IllegalArgumentException e) {
+ throw new IgniteCheckedException("Failed to override deployment mode using system property " +
+ "(are there any misspellings?)" +
+ "[name=" + IGNITE_DEP_MODE_OVERRIDE + ", value=" + depModeName + ']', e);
+ }
+ }
+ }
+
+ if (myCfg.getUserAttributes() == null) {
+ Map<String, ?> emptyAttr = Collections.emptyMap();
+ myCfg.setUserAttributes(emptyAttr);
+ }
+
+ if (myCfg.getMBeanServer() == null)
+ myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
+
Marshaller marsh = myCfg.getMarshaller();
if (marsh == null) {
@@ -1564,33 +1601,12 @@ public class IgnitionEx {
"Using GridOptimizedMarshaller on untested JVM.");
}
- // Check for deployment mode override.
- String depModeName = IgniteSystemProperties.getString(IGNITE_DEP_MODE_OVERRIDE);
-
- if (!F.isEmpty(depModeName)) {
- if (!F.isEmpty(myCfg.getCacheConfiguration())) {
- U.quietAndInfo(log, "Skipping deployment mode override for caches (custom closure " +
- "execution may not work for console Visor)");
- }
- else {
- try {
- DeploymentMode depMode = DeploymentMode.valueOf(depModeName);
-
- if (myCfg.getDeploymentMode() != depMode)
- myCfg.setDeploymentMode(depMode);
- }
- catch (IllegalArgumentException e) {
- throw new IgniteCheckedException("Failed to override deployment mode using system property " +
- "(are there any misspellings?)" +
- "[name=" + IGNITE_DEP_MODE_OVERRIDE + ", value=" + depModeName + ']', e);
- }
- }
- }
-
myCfg.setMarshaller(marsh);
- myCfg.setConnectorConfiguration(myCfg.getConnectorConfiguration() != null ?
- new ConnectorConfiguration(myCfg.getConnectorConfiguration()) : null);
+ if (myCfg.getPeerClassLoadingLocalClassPathExclude() == null)
+ myCfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR);
+
+ myCfg.setNodeId(nodeId);
IgfsConfiguration[] igfsCfgs = myCfg.getIgfsConfiguration();
@@ -1603,14 +1619,6 @@ public class IgnitionEx {
myCfg.setIgfsConfiguration(clone);
}
- if (myCfg.getMBeanServer() == null)
- myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer());
-
- myCfg.setNodeId(nodeId);
-
- if (myCfg.getPeerClassLoadingLocalClassPathExclude() == null)
- myCfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR);
-
StreamerConfiguration[] streamerCfgs = myCfg.getStreamerConfiguration();
if (streamerCfgs != null) {
@@ -1622,18 +1630,10 @@ public class IgnitionEx {
myCfg.setStreamerConfiguration(clone);
}
- myCfg.setTransactionConfiguration(myCfg.getTransactionConfiguration() != null ?
- new TransactionConfiguration(myCfg.getTransactionConfiguration()) : null);
-
- if (myCfg.getUserAttributes() == null) {
- Map<String, ?> emptyAttr = Collections.emptyMap();
- myCfg.setUserAttributes(emptyAttr);
- }
+ initializeDefaultSpi(myCfg);
initializeDefaultCacheConfiguration(myCfg);
- initializeDefaultSpi(myCfg);
-
return myCfg;
}
@@ -1722,7 +1722,7 @@ public class IgnitionEx {
}
/**
- * Initialize default values for spi.
+ * Initialize default SPI implementations.
*
* @param cfg Ignite configuration.
*/
[22/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6e2ef56a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6e2ef56a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6e2ef56a
Branch: refs/heads/ignite-239
Commit: 6e2ef56a2e9e68629d52ace16c394fb58b70ad42
Parents: 509d2d8
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 26 12:01:04 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 26 12:01:04 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6e2ef56a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 77df6f4..c21ceb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -455,9 +455,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public Collection<String> getUserAttributesFormatted() {
assert cfg != null;
- return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() {
- @Override
- public String apply(Map.Entry<String, ?> e) {
+ return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() {
+ @Override public String apply(Map.Entry<String,?> e) {
return e.getKey() + ", " + e.getValue().toString();
}
});
[29/37] incubator-ignite git commit: Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Posted by sb...@apache.org.
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a792c995
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a792c995
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a792c995
Branch: refs/heads/ignite-239
Commit: a792c995ed211f56b741396ab9c2cf2f74646597
Parents: 9fb1eeb f053746
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 19:57:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 19:57:11 2015 +0300
----------------------------------------------------------------------
.../HibernateReadWriteAccessStrategy.java | 81 +++++++++++++++-----
1 file changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[08/37] incubator-ignite git commit: Merge branch 'sprint-2' into
ignite-311
Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7a7e445
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7a7e445
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7a7e445
Branch: refs/heads/ignite-239
Commit: c7a7e445225cfbfbb8476ebe14eaeed12d8b2ae8
Parents: 79572ad 413b6c8
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 14:06:45 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 14:06:45 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/37] incubator-ignite git commit: #ignite-311: small fix.
Posted by sb...@apache.org.
#ignite-311: small fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a96bb102
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a96bb102
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a96bb102
Branch: refs/heads/ignite-239
Commit: a96bb1029c68eda1dee28a424cc8874ad04c31aa
Parents: d57dc23
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 15:28:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 15:28:07 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a96bb102/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 6b3dbfd..7e9427d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1579,8 +1579,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String info = PLUGIN_INFO + NL;
for (PluginConfiguration cfg : pluginsCfg)
- info += ">>> " + cfg.name() + " " + cfg.version() + NL +
- ">>> " + cfg.copyright();
+ info += ">>> " + cfg.name() + " " + cfg.version() + NL +
+ ">>> " + cfg.copyright();
return info;
}
[36/37] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/sprint-2' into ignite-239
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba010da4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba010da4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba010da4
Branch: refs/heads/ignite-239
Commit: ba010da403a0425f6d0ccfe006e41e1997bbbf9f
Parents: 8476463 036bd71
Author: ivasilinets <va...@gmail.com>
Authored: Sun Mar 1 15:26:27 2015 +0300
Committer: ivasilinets <va...@gmail.com>
Committed: Sun Mar 1 15:26:27 2015 +0300
----------------------------------------------------------------------
.../store/CacheNodeWithStoreStartup.java | 6 +-
.../store/jdbc/CacheJdbcPersonStore.java | 115 +++++++------------
.../apache/ignite/cache/store/CacheStore.java | 4 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 17 ++-
.../apache/ignite/internal/GridProperties.java | 78 -------------
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 18 +--
.../ignite/internal/IgniteProperties.java | 79 +++++++++++++
.../ignite/internal/IgniteVersionUtils.java | 8 +-
.../processors/cache/GridCacheStoreManager.java | 6 +-
.../plugin/IgnitePluginProcessor.java | 24 ++++
.../apache/ignite/plugin/PluginProvider.java | 5 +
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
.../junits/cache/TestCacheSession.java | 5 +
.../cache/TestThreadLocalCacheSession.java | 5 +
.../HibernateReadWriteAccessStrategy.java | 81 ++++++++++---
17 files changed, 264 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
[03/37] incubator-ignite git commit: #ignite-311: read gridgain
version.
Posted by sb...@apache.org.
#ignite-311: read gridgain version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da5f5201
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da5f5201
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da5f5201
Branch: refs/heads/ignite-239
Commit: da5f52014b5263e3ba70c1a7d133e80ff7e939d2
Parents: 1ad3bca
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Feb 19 19:33:56 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Feb 19 19:33:56 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/GridProperties.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da5f5201/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
index 9b58360..bf8f93e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
@@ -43,7 +43,7 @@ public class GridProperties {
* @param path Path.
* @param throwExc Flag indicating whether to throw an exception or not.
*/
- private static void readProperties(String path, boolean throwExc) {
+ public static void readProperties(String path, boolean throwExc) {
try (InputStream is = IgniteVersionUtils.class.getClassLoader().getResourceAsStream(path)) {
if (is == null) {
if (throwExc)
[14/37] incubator-ignite git commit: #ignite-311: add copyright.
Posted by sb...@apache.org.
#ignite-311: add copyright.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d57dc237
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d57dc237
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d57dc237
Branch: refs/heads/ignite-239
Commit: d57dc2373a0127a16f0c1f10860c40259b228882
Parents: 5eeb8a2
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 20 15:23:12 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 20 15:23:12 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 3 ++-
.../main/java/org/apache/ignite/plugin/PluginConfiguration.java | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57dc237/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2b6e832..6b3dbfd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1579,7 +1579,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String info = PLUGIN_INFO + NL;
for (PluginConfiguration cfg : pluginsCfg)
- info += ">>> " + cfg.name() + " " + cfg.version() + NL;
+ info += ">>> " + cfg.name() + " " + cfg.version() + NL +
+ ">>> " + cfg.copyright();
return info;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d57dc237/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
index 9323d6f..568f1ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginConfiguration.java
@@ -38,4 +38,9 @@ public interface PluginConfiguration {
* @return Plugin version.
*/
public String version();
+
+ /**
+ * @return Copyright.
+ */
+ public String copyright();
}
[24/37] incubator-ignite git commit: Merge branch 'sprint-2' into
ignite-322
Posted by sb...@apache.org.
Merge branch 'sprint-2' into ignite-322
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96deb436
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96deb436
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96deb436
Branch: refs/heads/ignite-239
Commit: 96deb436833efa77eadca95753eca2a2d0817814
Parents: 5ed43d1 47539d8
Author: Artem Shutak <as...@gridgain.com>
Authored: Fri Feb 27 12:30:52 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Fri Feb 27 12:30:52 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/IgniteFs.java | 2 +-
.../ignite/events/DiscoveryCustomEvent.java | 56 ----------
.../org/apache/ignite/events/EventType.java | 14 +--
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../internal/events/DiscoveryCustomEvent.java | 68 ++++++++++++
.../discovery/GridDiscoveryManager.java | 7 +-
.../cache/VisorCacheMetricsCollectorTask.java | 10 +-
.../node/VisorNodeEventsCollectorTask.java | 10 +-
.../internal/visor/node/VisorNodeGcTask.java | 10 +-
.../internal/visor/node/VisorNodePingTask.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 +-
.../internal/GridDiscoveryEventSelfTest.java | 9 +-
...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +++++++++++++++++++
.../testsuites/IgniteKernalSelfTestSuite.java | 1 +
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../testsuites/IgniteHadoopTestSuite.java | 7 +-
16 files changed, 219 insertions(+), 101 deletions(-)
----------------------------------------------------------------------