You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/03/04 02:31:50 UTC
[20/50] [abbrv] incubator-ignite git commit: IGNITE-261 Fixes after
merge.
IGNITE-261 Fixes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45679252
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45679252
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45679252
Branch: refs/heads/master
Commit: 4567925220c448eb101b1c7be97df80988046a33
Parents: d13fcd0
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Feb 16 19:56:27 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Feb 16 19:56:27 2015 +0700
----------------------------------------------------------------------
.../examples/ScalarCacheQueryExample.scala | 4 ++-
.../pimps/ScalarCacheConfigurationHelper.java | 33 --------------------
.../ignite/scalar/pimps/ScalarCachePimp.scala | 5 ---
3 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45679252/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
index 6d40544..9de8954 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
@@ -17,6 +17,8 @@
package org.apache.ignite.scalar.examples
+import org.apache.ignite.configuration.CacheConfiguration
+
import java.util._
import org.apache.ignite.{IgniteCache, Ignite}
@@ -64,7 +66,7 @@ object ScalarCacheQueryExample {
// Using distributed queries for partitioned cache and local queries for replicated cache.
// Since in replicated caches data is available on all nodes, including local one,
// it is enough to just query the local node.
- val prj = if (cache$(CACHE_NAME).get.configuration().getCacheMode == PARTITIONED)
+ val prj = if (cache.getConfiguration(classOf[CacheConfiguration[CacheAffinityKey[UUID], Person]]).getCacheMode == PARTITIONED)
ignite.cluster().forRemotes()
else
ignite.cluster().forLocal()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45679252/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheConfigurationHelper.java
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheConfigurationHelper.java b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheConfigurationHelper.java
deleted file mode 100644
index 55a4ab6..0000000
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheConfigurationHelper.java
+++ /dev/null
@@ -1,33 +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.scalar.pimps;
-
-import org.apache.ignite.*;
-import org.apache.ignite.configuration.*;
-
-/**
- * TODO: Add class description.
- */
-public class ScalarCacheConfigurationHelper {
- /**
- * @param cache Cache.
- */
- public static CacheConfiguration extract(IgniteCache cache) {
- return (CacheConfiguration)cache.getConfiguration(CacheConfiguration.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/45679252/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
index 05a5e2b..42bd716 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
@@ -18,13 +18,11 @@
package org.apache.ignite.scalar.pimps
import org.apache.ignite.cache.query._
-import org.apache.ignite.configuration.CacheConfiguration
import javax.cache.Cache
import org.apache.ignite._
import org.apache.ignite.lang.{IgnitePredicate, IgniteReducer}
-import org.apache.ignite.scalar.pimps.ScalarCacheConfigurationHelper._
import org.apache.ignite.scalar.scalar._
import org.jetbrains.annotations.Nullable
@@ -33,7 +31,6 @@ import java.util.{List => JavaList, Set => JavaSet}
import scala.collection._
import scala.collection.JavaConversions._
-
/**
* Companion object.
*/
@@ -97,8 +94,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
*/
def compare(that: IgniteCache[K, V]): Int = that.getName.compareTo(value.getName)
- def configuration(): CacheConfiguration = extract(value)
-
/**
* Gets iterator for cache entries.
*/