ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: IGNITE-SQL Removed indexingSpiName property.
Date Fri, 13 Feb 2015 15:47:50 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sql-tests 426e48ef7 -> 5b953163a


IGNITE-SQL Removed indexingSpiName property.


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

Branch: refs/heads/ignite-sql-tests
Commit: 5b953163af526b2f46df48cdc97f6979bd4fcdfc
Parents: 426e48e
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Fri Feb 13 18:42:58 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Feb 13 18:47:23 2015 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       | 32 --------------------
 .../processors/cache/GridCacheAttributes.java   | 13 --------
 .../processors/cache/GridCacheProcessor.java    |  3 --
 .../visor/cache/VisorCacheConfiguration.java    | 18 -----------
 .../commands/cache/VisorCacheCommand.scala      |  1 -
 modules/yardstick/config/ignite-base-config.xml | 16 ----------
 6 files changed, 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index e80764a..723ac5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -299,9 +299,6 @@ public class CacheConfiguration extends MutableConfiguration {
     private CacheAffinityKeyMapper affMapper;
 
     /** */
-    private String indexingSpiName;
-
-    /** */
     private long preloadDelay;
 
     /** */
@@ -366,7 +363,6 @@ public class CacheConfiguration extends MutableConfiguration {
         evictSyncConcurrencyLvl = cc.getEvictSynchronizedConcurrencyLevel();
         evictSyncTimeout = cc.getEvictSynchronizedTimeout();
         expiryPolicyFactory = cc.getExpiryPolicyFactory();
-        indexingSpiName = cc.getIndexingSpiName();
         interceptor = cc.getInterceptor();
         invalidate = cc.isInvalidate();
         isReadThrough = cc.isReadThrough();
@@ -1460,34 +1456,6 @@ public class CacheConfiguration extends MutableConfiguration {
     }
 
     /**
-     * Gets name of the SPI to use for indexing. If not specified, the default
-     * indexing SPI will be used.
-     * <p>
-     * This property becomes useful in rare cases when more than one indexing
-     * SPI is configured. In majority of the cases default value should be used.
-     *
-     * @return Name of SPI to use for indexing.
-     * @see IndexingSpi
-     */
-    public String getIndexingSpiName() {
-        return indexingSpiName;
-    }
-
-    /**
-     * Sets name of the SPI to use for indexing. If not specified, the default
-     * indexing SPI will be used.
-     * <p>
-     * This property becomes useful in rare cases when more than one indexing
-     * SPI is configured. In majority of the cases default value should be used.
-     *
-     * @param indexingSpiName Name.
-     * @see IndexingSpi
-     */
-    public void setIndexingSpiName(String indexingSpiName) {
-        this.indexingSpiName = indexingSpiName;
-    }
-
-    /**
      * Gets maximum amount of memory available to off-heap storage. Possible values are
      * <ul>
      * <li>{@code -1} - Means that off-heap storage is disabled.</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index b0cfb6b..9e12e3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -103,9 +103,6 @@ public class GridCacheAttributes implements Externalizable {
     /** Maximum batch size for write-behind cache store. */
     private int writeBehindBatchSize;
 
-    /** Name of SPI to use for indexing. */
-    private String indexingSpiName;
-
     /** Cache affinity class name. */
     private String affClsName;
 
@@ -169,7 +166,6 @@ public class GridCacheAttributes implements Externalizable {
         evictMaxOverflowRatio = cfg.getEvictMaxOverflowRatio();
         evictNearSync = cfg.isEvictNearSynchronized();
         evictSync = cfg.isEvictSynchronized();
-        indexingSpiName = cfg.getIndexingSpiName();
         loadPrevVal = cfg.isLoadPreviousValue();
         name = cfg.getName();
         partDistro = GridCacheUtils.distributionMode(cfg);
@@ -510,13 +506,6 @@ public class GridCacheAttributes implements Externalizable {
         return writeBehindBatchSize;
     }
 
-    /**
-     * @return Name of SPI to use for indexing.
-     */
-    public String indexingSpiName() {
-        return indexingSpiName;
-    }
-
     /** {@inheritDoc} */
     @Override public void writeExternal(ObjectOutput out) throws IOException {
         U.writeEnum(out, atomicityMode);
@@ -526,7 +515,6 @@ public class GridCacheAttributes implements Externalizable {
         out.writeFloat(evictMaxOverflowRatio);
         out.writeBoolean(evictNearSync);
         out.writeBoolean(evictSync);
-        U.writeString(out, indexingSpiName);
         out.writeBoolean(loadPrevVal);
         U.writeString(out, name);
         U.writeEnum(out, partDistro);
@@ -571,7 +559,6 @@ public class GridCacheAttributes implements Externalizable {
         evictMaxOverflowRatio = in.readFloat();
         evictNearSync = in.readBoolean();
         evictSync  = in.readBoolean();
-        indexingSpiName = U.readString(in);
         loadPrevVal = in.readBoolean();
         name = U.readString(in);
         partDistro = CacheDistributionMode.fromOrdinal(in.readByte());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c7f739c..0502744 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1163,9 +1163,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                             "Eviction max overflow ratio", locAttr.evictMaxOverflowRatio(),
                             rmtAttr.evictMaxOverflowRatio(), true);
 
-                        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "indexingSpiName",
"IndexingSpiName",
-                            locAttr.indexingSpiName(), rmtAttr.indexingSpiName(), true);
-
                         CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled",
                             "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(),
true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index 36495e0..2809560 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -103,9 +103,6 @@ public class VisorCacheConfiguration implements Serializable {
     /** Memory mode. */
     private CacheMemoryMode memoryMode;
 
-    /** Name of SPI to use for indexing. */
-    private String indexingSpiName;
-
     /** Cache interceptor. */
     private String interceptor;
 
@@ -163,7 +160,6 @@ public class VisorCacheConfiguration implements Serializable {
 //        cfg.pessimisticTxLoggerSize(ccfg.getPessimisticTxLogSize());
 //        cfg.pessimisticTxLoggerLinger(ccfg.getPessimisticTxLogLinger());
         cfg.memoryMode(ccfg.getMemoryMode());
-        cfg.indexingSpiName(ccfg.getIndexingSpiName());
         cfg.interceptor(compactClass(ccfg.getInterceptor()));
         cfg.affinityConfiguration(VisorCacheAffinityConfiguration.from(ccfg));
         cfg.preloadConfiguration(VisorCachePreloadConfiguration.from(ccfg));
@@ -517,20 +513,6 @@ public class VisorCacheConfiguration implements Serializable {
     }
 
     /**
-     * @return Name of SPI to use for indexing.
-     */
-    public String indexingSpiName() {
-        return indexingSpiName;
-    }
-
-    /**
-     * @param indexingSpiName New name of SPI to use for indexing.
-     */
-    public void indexingSpiName(String indexingSpiName) {
-        this.indexingSpiName = indexingSpiName;
-    }
-
-    /**
      * @return Cache interceptor.
      */
     @Nullable public String interceptor() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index dcdb07a..2b57d77 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -840,7 +840,6 @@ object VisorCacheCommand {
         cacheT += ("Default Query Timeout", defaultCfg.queryTimeout())
         cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled())
         cacheT += ("Query Iterators Number", cfg.maxQueryIteratorCount())
-        cacheT += ("Indexing SPI Name", cfg.indexingSpiName())
         cacheT += ("Cache Interceptor", cfg.interceptor())
 
         cacheT += ("DGC Frequency", dgcCfg.frequency())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b953163/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 1214b8a..f4b91be 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -44,18 +44,6 @@
             </bean>
         </property>
 
-        <!--<property name="indexingSpi">-->
-            <!--<list>-->
-                <!--<bean class="org.apache.ignite.spi.indexing.h2.H2IndexingSpi">-->
-                    <!--<property name="name" value="offheap"/>-->
-                    <!--<property name="maxOffHeapMemory" value="#{500*1024*1024}"/>-->
-                <!--</bean>-->
-                <!--<bean class="org.apache.ignite.spi.indexing.h2.H2IndexingSpi">-->
-                    <!--<property name="name" value="default"/>-->
-                <!--</bean>-->
-            <!--</list>-->
-        <!--</property>-->
-
         <property name="cacheConfiguration">
             <list>
                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -149,8 +137,6 @@
 
                     <!-- Enable query indexing for query cache. -->
                     <property name="queryIndexEnabled" value="true"/>
-
-                    <property name="indexingSpiName" value="default"/>
                 </bean>
 
                 <bean class="org.apache.ignite.configuration.CacheConfiguration">
@@ -166,8 +152,6 @@
                     <property name="queryIndexEnabled" value="true"/>
 
                     <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
-                    <!--<property name="indexingSpiName" value="offheap"/>-->
                 </bean>
 
                 <bean class="org.apache.ignite.configuration.CacheConfiguration">


Mime
View raw message