incubator-ignite git commit: ignite-45: wip
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 ef624c58c -> b03a4835c
ignite-45: wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b03a4835
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b03a4835
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b03a4835
Branch: refs/heads/ignite-45
Commit: b03a4835cd4f6329ecab3e68e0948e579e17c99f
Parents: ef624c5
Author: Yakov Zhdanov
Authored: Fri Jan 9 12:52:02 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Jan 9 12:52:02 2015 +0300
--
.../org/apache/ignite/IgniteCacheManager.java | 26 +---
.../apache/ignite/IgniteCachingProvider.java| 20 ++-
.../processors/cache/IgniteCacheProxy.java | 20 ---
3 files changed, 57 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b03a4835/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
index 7cfeca1..a7dab9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
@@ -77,6 +77,9 @@ public class IgniteCacheManager implements CacheManager {
if (cacheCfg == null)
throw new NullPointerException();
+if (cacheName == null)
+throw new NullPointerException();
+
if (!(cacheCfg instanceof CompleteConfiguration))
throw new UnsupportedOperationException("Configuration is not
supported: " + cacheCfg);
@@ -86,7 +89,7 @@ public class IgniteCacheManager implements CacheManager {
if (cfgCacheName != null && !cacheName.equals(cfgCacheName))
throw new IllegalArgumentException();
-cacheCfg = (C)new
GridCacheConfiguration((GridCacheConfiguration)cacheCfg);
+cacheCfg = (C)new
GridCacheConfiguration((CompleteConfiguration)cacheCfg);
((GridCacheConfiguration)cacheCfg).setName(cacheName);
}
@@ -175,13 +178,22 @@ public class IgniteCacheManager implements CacheManager {
@Override public Iterable getCacheNames() {
ensureNotClosed();
-Collection res;
+String[] resArr;
synchronized (igniteMap) {
-res = new ArrayList<>(igniteMap.keySet());
+resArr = igniteMap.keySet().toArray(new
String[igniteMap.keySet().size()]);
}
-return res;
+return Arrays.asList(resArr);
+}
+
+/**
+ * @param ignite Ignite.
+ */
+public boolean isManagedIgnite(Ignite ignite) {
+synchronized (igniteMap) {
+return igniteMap.values().contains(ignite);
+}
}
/** {@inheritDoc} */
@@ -209,11 +221,17 @@ public class IgniteCacheManager implements CacheManager {
/** {@inheritDoc} */
@Override public void enableManagement(String cacheName, boolean enabled) {
+if (cacheName == null)
+throw new NullPointerException();
+
throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
@Override public void enableStatistics(String cacheName, boolean enabled) {
+if (cacheName == null)
+throw new NullPointerException();
+
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b03a4835/modules/core/src/main/java/org/apache/ignite/IgniteCachingProvider.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteCachingProvider.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCachingProvider.java
index eab4cf9..e67434e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCachingProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCachingProvider.java
@@ -66,7 +66,7 @@ public class IgniteCachingProvider implements CachingProvider
{
IgniteCacheManager mgr = uriMap.get(uri);
-if (mgr == null) {
+if (mgr == null || mgr.isClosed()) {
mgr = new IgniteCacheManager(uri, this, clsLdr);
uriMap.put(uri, mgr);
@@ -101,6 +101,24 @@ public class IgniteCachingProvider implements
CachingProvider {
return getCacheManager(getDefaultURI(), getDefaultClassLoader());
}
+/**
+ * @param cache Cache.
+ */
+public CacheManager findManager(IgniteCache cache) {
+Ignite ignite = cache.ignite();
+
+synchronized (cacheMan
incubator-ignite git commit: ignite-45: wip
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-45 b03a4835c -> 5190b1217
ignite-45: wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5190b121
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5190b121
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5190b121
Branch: refs/heads/ignite-45
Commit: 5190b12171bec52727fd40f6c69c8a3c5ac1112f
Parents: b03a483
Author: Yakov Zhdanov
Authored: Fri Jan 9 17:47:52 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Jan 9 17:47:52 2015 +0300
--
.../org/apache/ignite/IgniteCacheManager.java | 32 ++--
.../apache/ignite/IgniteCachingProvider.java| 7 +++--
.../org/gridgain/grid/cache/GridCacheEntry.java | 3 +-
.../processors/cache/GridCacheEntryImpl.java| 8 +
.../cache/GridCacheEvictionEntry.java | 8 +
.../cache/GridCacheFilterEvaluationEntry.java | 8 +
.../cache/query/GridCacheQueryManager.java | 8 +
.../GridCacheContinuousQueryEntry.java | 8 +
.../cache/eviction/GridCacheMockEntry.java | 8 +
9 files changed, 78 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5190b121/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
index a7dab9b..2f0073f 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
@@ -36,17 +36,22 @@ public class IgniteCacheManager implements CacheManager {
private final ClassLoader clsLdr;
/** */
+private final Properties props;
+
+/** */
private final AtomicBoolean closed = new AtomicBoolean();
/**
* @param uri Uri.
* @param cachingProvider Caching provider.
* @param clsLdr Class loader.
+ * @param props
*/
-public IgniteCacheManager(URI uri, CachingProvider cachingProvider,
ClassLoader clsLdr) {
+public IgniteCacheManager(URI uri, CachingProvider cachingProvider,
ClassLoader clsLdr, Properties props) {
this.uri = uri;
this.cachingProvider = cachingProvider;
this.clsLdr = clsLdr;
+this.props = props;
}
/** {@inheritDoc} */
@@ -66,7 +71,7 @@ public class IgniteCacheManager implements CacheManager {
/** {@inheritDoc} */
@Override public Properties getProperties() {
-return null;
+return props;
}
/** {@inheritDoc} */
@@ -86,12 +91,15 @@ public class IgniteCacheManager implements CacheManager {
if (cacheCfg instanceof GridCacheConfiguration) {
String cfgCacheName = ((GridCacheConfiguration)cacheCfg).getName();
-if (cfgCacheName != null && !cacheName.equals(cfgCacheName))
-throw new IllegalArgumentException();
-
-cacheCfg = (C)new
GridCacheConfiguration((CompleteConfiguration)cacheCfg);
+if (cfgCacheName != null) {
+if (!cacheName.equals(cfgCacheName))
+throw new IllegalArgumentException();
+}
+else {
+cacheCfg = (C)new
GridCacheConfiguration((CompleteConfiguration)cacheCfg);
-((GridCacheConfiguration)cacheCfg).setName(cacheName);
+((GridCacheConfiguration)cacheCfg).setName(cacheName);
+}
}
Ignite ignite;
@@ -176,7 +184,9 @@ public class IgniteCacheManager implements CacheManager {
/** {@inheritDoc} */
@Override public Iterable getCacheNames() {
-ensureNotClosed();
+if (isClosed())
+return Collections.emptySet(); // javadoc of #getCacheNames() says
that IllegalStateException should be
+ // thrown but
CacheManagerTest.close_cachesEmpty() require empty collection.
String[] resArr;
@@ -184,7 +194,7 @@ public class IgniteCacheManager implements CacheManager {
resArr = igniteMap.keySet().toArray(new
String[igniteMap.keySet().size()]);
}
-return Arrays.asList(resArr);
+return Collections.unmodifiableCollection(Arrays.asList(resArr));
}
/**
@@ -221,6 +231,8 @@ public class IgniteCacheManager implements CacheManager {
/** {@inheritDoc} */
@Override public void enableManagement(String cacheName, boolean enabled) {
+ensureNotClosed();
+
if (cacheName == null)
throw new NullPointerException();
@@ -229,6 +241,8 @@ public class IgniteCacheManager
incubator-ignite git commit: # IGNITE-32 WIP: Implemented custom naming.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 2238d6fd4 -> 356d3311c
# IGNITE-32 WIP: Implemented custom naming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/356d3311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/356d3311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/356d3311
Branch: refs/heads/ignite-32
Commit: 356d3311c79345a9224791a4bf9e6273a8f7faba
Parents: 2238d6f
Author: AKuznetsov
Authored: Fri Jan 9 22:47:05 2015 +0700
Committer: AKuznetsov
Committed: Fri Jan 9 22:47:05 2015 +0700
--
.../org/apache/ignite/schema/ui/Controls.java | 25 +++-
.../org/apache/ignite/schema/ui/GridPaneEx.java | 18 ---
.../apache/ignite/schema/ui/NamingDialog.java | 113 +-
.../apache/ignite/schema/ui/SchemaLoadApp.java | 117 ++-
4 files changed, 216 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/356d3311/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
index 99a60b3..864861d 100644
---
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
+++
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/Controls.java
@@ -204,10 +204,17 @@ public class Controls {
/**
* Create text field.
*
+ * @param txt Textual content of this text field.
+ * @param tip Tooltip text.
* @return New {@code TextField} instance.
*/
-public static TextField textField() {
-return new TextField();
+public static TextField textField(String txt, String tip) {
+TextField tf = new TextField();
+
+tf.setText(txt);
+tf.setTooltip(new Tooltip(tip));
+
+return tf;
}
/**
@@ -227,6 +234,20 @@ public class Controls {
}
/**
+ * Create password field.
+ *
+ * @param tip Tooltip text.
+ * @return New {@code PasswordField} instance.
+ */
+public static PasswordField passwordField(String tip) {
+PasswordField pf = new PasswordField();
+
+pf.setTooltip(new Tooltip(tip));
+
+return pf;
+}
+
+/**
* Create split pane for provided nodes.
*
* @param node1 First node.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/356d3311/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
index 6d847ce..c57ce75 100644
---
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
+++
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
@@ -28,15 +28,6 @@ public class GridPaneEx extends GridPane {
}
/**
- * Add fixed width column.
- *
- * @param width Column width.
- */
-public void addColumn(double width) {
-getColumnConstraints().add(new ColumnConstraints(width));
-}
-
-/**
* Add default column.
*/
public void addColumn() {
@@ -60,15 +51,6 @@ public class GridPaneEx extends GridPane {
}
/**
- * Add fixed height row.
- *
- * @param height Row height.
- */
-public void addRow(double height) {
-getRowConstraints().add(new RowConstraints(height));
-}
-
-/**
* Add default row.
*/
public void addRow() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/356d3311/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java
index e4269ee..1c94cdf 100644
---
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java
+++
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/NamingDialog.java
@@ -3,6 +3,7 @@
package org.apache.ignite.schema.ui;
import javafx.event.*;
+import javafx.scene.control.*;
import javafx.scene.layout.*;
import javafx.stage.*;
@@ -15,12 +16,36 @@ public class NamingDialog extends Stage {
/** Owner window. */
private final Stage owner;
+/** */
+private final TextField prefixTf;
+
+/** */
+private final TextFiel
