ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: # IGNITE-392 Cleanup Visor code after CacheQueryConfig and QueryConfig were removed.
Date Wed, 04 Mar 2015 10:14:19 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sql-tests 836c41040 -> fc6d9bf51


# IGNITE-392 Cleanup Visor code after  CacheQueryConfig and QueryConfig were removed.


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

Branch: refs/heads/ignite-sql-tests
Commit: fc6d9bf51bb7b35038676953574b9e52e983b2aa
Parents: 836c410
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Mar 4 17:14:03 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Mar 4 17:14:03 2015 +0700

----------------------------------------------------------------------
 .../visor/cache/VisorCacheConfiguration.java    |  10 --
 .../node/VisorCacheQueryConfiguration.java      |  78 --------------
 .../visor/node/VisorGridConfiguration.java      |  10 --
 .../visor/node/VisorQueryConfiguration.java     | 106 -------------------
 .../commands/cache/VisorCacheCommand.scala      |  11 --
 .../config/VisorConfigurationCommand.scala      |  15 ---
 6 files changed, 230 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/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 71e1cde..e817db0 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
@@ -126,9 +126,6 @@ public class VisorCacheConfiguration implements Serializable {
     /** Class name of expiry policy factory. */
     private String expiryPlcFactory;
 
-    /** Query configuration. */
-    private VisorCacheQueryConfiguration qryCfg;
-
     /**
      * @param ignite Grid.
      * @param ccfg Cache configuration.
@@ -406,13 +403,6 @@ public class VisorCacheConfiguration implements Serializable {
         return storeCfg;
     }
 
-    /**
-     * @return Cache query configuration.
-     */
-    public VisorCacheQueryConfiguration queryConfiguration() {
-        return qryCfg;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(VisorCacheConfiguration.class, this);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
deleted file mode 100644
index 3f41aef..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
+++ /dev/null
@@ -1,78 +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.visor.node;
-
-import java.io.*;
-
-/**
- * Data transfer object for cache query configuration data.
- */
-public class VisorCacheQueryConfiguration implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Query type resolver class name. */
-    private String typeRslvr;
-
-    /** {@code true} if primitive keys should be indexed. */
-    private boolean idxPrimitiveKey;
-
-    /** {@code true} if primitive values should be indexed. */
-    private boolean idxPrimitiveVal;
-
-    /** {@code true} if SQL engine should try to convert values to their respective SQL types.
*/
-    private boolean idxFixedTyping;
-
-    /** {@code true} if SQL engine should generate SQL statements with escaped names. */
-    private boolean escapeAll;
-
-    /**
-     * @return Query type resolver class name.
-     */
-    public String typeResolver() {
-        return typeRslvr;
-    }
-
-    /**
-     * @return {@code true} if primitive keys should be indexed.
-     */
-    public boolean indexPrimitiveKey() {
-        return idxPrimitiveKey;
-    }
-
-    /**
-     * @return {@code true} if primitive values should be indexed.
-     */
-    public boolean indexPrimitiveValue() {
-        return idxPrimitiveVal;
-    }
-
-    /**
-     * @return {@code true} if SQL engine should try to convert values to their respective
SQL types.
-     */
-    public boolean indexFixedTyping() {
-        return idxFixedTyping;
-    }
-
-    /**
-     * @return {@code true} if SQL engine generate SQL statements with escaped names.
-     */
-    public boolean escapeAll() {
-        return escapeAll;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index baf5999..a6a4f31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -90,9 +90,6 @@ public class VisorGridConfiguration implements Serializable {
     /** Transactions configuration. */
     private VisorTransactionConfiguration txCfg;
 
-    /** Query configuration */
-    private VisorQueryConfiguration qryCfg;
-
     /**
      * @param ignite Grid.
      * @return Fill data transfer object with node configuration data.
@@ -250,13 +247,6 @@ public class VisorGridConfiguration implements Serializable {
         return txCfg;
     }
 
-    /**
-     * @return Query configuration.
-     */
-    public VisorQueryConfiguration queryConfiguration() {
-        return qryCfg;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(VisorGridConfiguration.class, this);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
deleted file mode 100644
index f941a2b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
+++ /dev/null
@@ -1,106 +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.visor.node;
-
-import org.apache.ignite.cache.query.annotations.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Data transfer object for query configuration data.
- */
-public class VisorQueryConfiguration implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Classes names with methods annotated by {@link QuerySqlFunction}. */
-    private String[] idxCustomFuncClss;
-
-    /** Optional search paths consisting of space names to search SQL schema objects. */
-    private String[] searchPath;
-
-    /** Script path to be ran against H2 database after opening. */
-    private String initScriptPath;
-
-    /** Maximum amount of memory available to off-heap storage. */
-    private long maxOffHeapMemory = -1;
-
-    /** Query execution time threshold. */
-    private long longQryExecTimeout;
-
-    /** If {@code true}, SPI will print SQL execution plan for long queries. */
-    private boolean longQryExplain;
-
-    /** The flag indicating that serializer for H2 database will be set to Ignite's marshaller.
*/
-    private boolean useOptimizedSerializer;
-    
-    /**
-     * @return Classes with methods annotated by {@link QuerySqlFunction}.
-     */
-    public String[] indexCustomFunctionClasses() {
-        return idxCustomFuncClss;
-    }
-
-    /**
-     * @return Optional search path consisting of space names to search SQL schema objects.
-     */
-    public String[] searchPath() {
-        return searchPath;
-    }
-
-    /**
-     * @return Script path to be ran against H2 database after opening.
-     */
-    public String initialScriptPath() {
-        return initScriptPath;
-    }
-
-    /**
-     * @return Maximum amount of memory available to off-heap storage.
-     */
-    public long maxOffHeapMemory() {
-        return maxOffHeapMemory;
-    }
-
-    /**
-     * @return Query execution time threshold.
-     */
-    public long longQueryExecutionTimeout() {
-        return longQryExecTimeout;
-    }
-
-    /**
-     * @return If {@code true}, SPI will print SQL execution plan for long queries.
-     */
-    public boolean longQryExplain() {
-        return longQryExplain;
-    }
-
-    /**
-     * @return The flag indicating that serializer for H2 database will be set to Ignite's
marshaller.
-     */
-    public boolean useOptimizedSerializer() {
-        return useOptimizedSerializer;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(VisorQueryConfiguration.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/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 f01c618..7497735 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
@@ -780,7 +780,6 @@ object VisorCacheCommand {
         val evictCfg = cfg.evictConfiguration()
         val defaultCfg = cfg.defaultConfiguration()
         val storeCfg = cfg.storeConfiguration()
-        val queryCfg = cfg.queryConfiguration()
 
         val cacheT = VisorTextTable()
 
@@ -861,16 +860,6 @@ object VisorCacheCommand {
         cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory()))
         cacheT += ("Expiry Policy Factory Class Name", safe(cfg.expiryPolicyFactory()))
 
-        if (queryCfg != null) {
-            cacheT +=("Query Type Resolver", safe(queryCfg.typeResolver()))
-            cacheT +=("Query Indexing Primitive Key", bool2Str(queryCfg.indexPrimitiveKey()))
-            cacheT +=("Query Indexing Primitive Value", bool2Str(queryCfg.indexPrimitiveValue()))
-            cacheT +=("Query Fixed Typing", bool2Str(queryCfg.indexFixedTyping()))
-            cacheT +=("Query Escaped Names", bool2Str(queryCfg.escapeAll()))
-        }
-        else
-            cacheT += ("Query Configuration", NA)
-
         println(title)
 
         cacheT.render()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc6d9bf5/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 788ef19..c4ac1c0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -237,21 +237,6 @@ class VisorConfigurationCommand {
             cmnT += ("Transaction Log Size", trn.getPessimisticTxLogSize)
             cmnT += ("Transaction Serializable Enabled", bool2Str(trn.txSerializableEnabled()))
 
-            val query = cfg.queryConfiguration()
-
-            if (query != null) {
-                cmnT += ("Query Function Classes", arr2Str(query.indexCustomFunctionClasses()))
-                cmnT += ("Query Path To SQL Schema Objects", arr2Str(query.searchPath()))
-                cmnT += ("Query Initial Script Path", safe(query.initialScriptPath()))
-                cmnT += ("Query Off-Heap Storage Memory",
-                    if (query.maxOffHeapMemory() >= 0) query.maxOffHeapMemory() else NA)
-                cmnT += ("Query Execution Time Threshold", query.longQueryExecutionTimeout())
-                cmnT += ("Query Long Queries Explaining", bool2Str(query.longQryExplain()))
-                cmnT += ("Query Serializer", bool2Str(query.useOptimizedSerializer()))
-            }
-            else
-                cmnT += ("Query Configuration", NA)
-
             cmnT.render()
 
             println("\nMetrics:")


Mime
View raw message