You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/04/19 16:37:37 UTC
[1/3] ignite git commit: Preparing.
Repository: ignite
Updated Branches:
refs/heads/ignite-5033 [created] 35e9bbdb6
Preparing.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f395ee5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f395ee5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f395ee5
Branch: refs/heads/ignite-5033
Commit: 9f395ee52b7570b16d672de53581dc68060ad590
Parents: f923bc9
Author: devozerov <vo...@gridgain.com>
Authored: Wed Apr 19 18:20:21 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Apr 19 18:20:21 2017 +0300
----------------------------------------------------------------------
.../DynamicIndexAbstractBasicSelfTest.java | 60 ++++++++++++++------
1 file changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f395ee5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
index 6bc1576..7cb46b1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
@@ -182,20 +182,18 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
private void checkCreate(CacheMode mode, CacheAtomicityMode atomicityMode, boolean near) throws Exception {
initialize(mode, atomicityMode, near);
- final IgniteEx node = node();
-
final QueryIndex idx = index(IDX_NAME_1, field(FIELD_NAME_1));
- queryProcessor(node).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(FIELD_NAME_1));
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
}, SchemaOperationException.CODE_INDEX_EXISTS);
- queryProcessor(node).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(FIELD_NAME_1));
assertSimpleIndexOperations(SQL_SIMPLE_FIELD_1);
@@ -270,7 +268,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
final QueryIndex idx = index(IDX_NAME_1, field(FIELD_NAME_1), field(alias(FIELD_NAME_2)));
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(FIELD_NAME_1), field(alias(FIELD_NAME_2)));
assertCompositeIndexOperations(SQL_COMPOSITE);
@@ -347,7 +345,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexCreate(randomString(), TBL_NAME, idx, false).get();
+ dynamicIndexCreate(randomString(), TBL_NAME, idx, false);
}
}, SchemaOperationException.CODE_CACHE_NOT_FOUND);
@@ -423,7 +421,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, randomString(), idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, randomString(), idx, false);
}
}, SchemaOperationException.CODE_TABLE_NOT_FOUND);
@@ -499,7 +497,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
}, SchemaOperationException.CODE_COLUMN_NOT_FOUND);
@@ -576,7 +574,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
QueryIndex idx = index(IDX_NAME_1, field(FIELD_NAME_2));
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
}, SchemaOperationException.CODE_COLUMN_NOT_FOUND);
@@ -584,7 +582,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
QueryIndex idx = index(IDX_NAME_1, field(alias(FIELD_NAME_2)));
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(alias(FIELD_NAME_2)));
assertSimpleIndexOperations(SQL_SIMPLE_FIELD_2);
@@ -659,7 +657,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
QueryIndex idx = index(IDX_NAME_1, field(FIELD_NAME_1));
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(FIELD_NAME_1));
assertIndexUsed(IDX_NAME_1, SQL_SIMPLE_FIELD_1, SQL_ARG_1);
@@ -668,7 +666,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
loadInitialData();
- queryProcessor(node()).dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, false).get();
+ dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, false);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
assertSimpleIndexOperations(SQL_SIMPLE_FIELD_1);
@@ -743,11 +741,11 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, false).get();
+ dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, false);
}
}, SchemaOperationException.CODE_INDEX_NOT_FOUND);
- queryProcessor(node()).dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true).get();
+ dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
}
@@ -820,7 +818,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexDrop(randomString(), "my_idx", false).get();
+ dynamicIndexDrop(randomString(), "my_idx", false);
}
}, SchemaOperationException.CODE_CACHE_NOT_FOUND);
@@ -842,7 +840,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true).get();
+ dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true);
}
}, SchemaOperationException.CODE_GENERIC);
@@ -850,7 +848,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
assertSchemaException(new RunnableX() {
@Override public void run() throws Exception {
- queryProcessor(node()).dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true).get();
+ dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true);
}
}, SchemaOperationException.CODE_GENERIC);
}
@@ -947,4 +945,30 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
for (Ignite node : Ignition.allGrids())
assertSqlCompositeData(node, sql, 0);
}
+
+ /**
+ * Synchronously create index.
+ *
+ * @param space Space.
+ * @param tblName Table name.
+ * @param idx Index.
+ * @param ifNotExists When set to true operation will fail if index already exists.
+ * @throws Exception If failed.
+ */
+ private void dynamicIndexCreate(String space, String tblName, QueryIndex idx, boolean ifNotExists)
+ throws Exception {
+ queryProcessor(node()).dynamicIndexCreate(space, tblName, idx, ifNotExists).get();
+ }
+
+ /**
+ * Synchronously drop index.
+ *
+ * @param space Space.
+ * @param idxName Index name.
+ * @param ifExists When set to true operation fill fail if index doesn't exists.
+ * @throws Exception if failed.
+ */
+ private void dynamicIndexDrop(String space, String idxName, boolean ifExists) throws Exception {
+ queryProcessor(node()).dynamicIndexDrop(space, idxName, ifExists).get();
+ }
}
[2/3] ignite git commit: Almost done.
Posted by vo...@apache.org.
Almost done.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3db61e86
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3db61e86
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3db61e86
Branch: refs/heads/ignite-5033
Commit: 3db61e86dd40c63b66f56049850c128290f836ed
Parents: 9f395ee
Author: devozerov <vo...@gridgain.com>
Authored: Wed Apr 19 19:07:53 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Apr 19 19:07:53 2017 +0300
----------------------------------------------------------------------
.../cache/index/AbstractSchemaSelfTest.java | 8 +-
.../DynamicIndexAbstractBasicSelfTest.java | 120 ++++++++++++++++---
.../index/DynamicIndexAbstractSelfTest.java | 33 ++---
3 files changed, 119 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db61e86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
index a865b18..e228026 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractSchemaSelfTest.java
@@ -204,7 +204,8 @@ public class AbstractSchemaSelfTest extends GridCommonAbstractTest {
}
}
- fail("Index not found [cacheName=" + cacheName + ", tlbName=" + tblName + ", idxName=" + idxName + ']');
+ fail("Index not found [node=" + node.name() + ", cacheName=" + cacheName + ", tlbName=" + tblName +
+ ", idxName=" + idxName + ']');
}
/**
@@ -263,7 +264,7 @@ public class AbstractSchemaSelfTest extends GridCommonAbstractTest {
* @param idxName Index name.
*/
protected static void assertNoIndex(IgniteEx node, String cacheName, String tblName, String idxName) {
- assertNoIndexDescriptor(node, cacheName, tblName, idxName);
+ assertNoIndexDescriptor(node, cacheName, idxName);
if (affinityNode(node, cacheName)) {
QueryTypeDescriptorImpl typeDesc = typeExisting(node, cacheName, tblName);
@@ -277,10 +278,9 @@ public class AbstractSchemaSelfTest extends GridCommonAbstractTest {
*
* @param node Node.
* @param cacheName Cache name.
- * @param tblName Table name.
* @param idxName Index name.
*/
- protected static void assertNoIndexDescriptor(IgniteEx node, String cacheName, String tblName, String idxName) {
+ protected static void assertNoIndexDescriptor(IgniteEx node, String cacheName, String idxName) {
awaitCompletion();
DynamicCacheDescriptor desc = node.context().cache().cacheDescriptor(cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db61e86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
index 7cb46b1..94dc831 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
@@ -22,14 +22,20 @@ import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.schema.SchemaOperationException;
+import org.apache.ignite.internal.util.GridStringBuilder;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import javax.cache.CacheException;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -343,13 +349,21 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
final QueryIndex idx = index(IDX_NAME_1, field(FIELD_NAME_1));
- assertSchemaException(new RunnableX() {
- @Override public void run() throws Exception {
- dynamicIndexCreate(randomString(), TBL_NAME, idx, false);
- }
- }, SchemaOperationException.CODE_CACHE_NOT_FOUND);
+ try {
+ queryProcessor(node()).dynamicIndexCreate(randomString(), TBL_NAME, idx, false).get();
+ }
+ catch (SchemaOperationException e) {
+ assertEquals(SchemaOperationException.CODE_CACHE_NOT_FOUND, e.code());
- assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
+ assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
+
+ return;
+ }
+ catch (Exception e) {
+ fail("Unexpected exception: " + e);
+ }
+
+ fail(SchemaOperationException.class.getSimpleName() + " is not thrown.");
}
/**
@@ -816,13 +830,21 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
private void checkDropNoCache(CacheMode mode, CacheAtomicityMode atomicityMode, boolean near) throws Exception {
initialize(mode, atomicityMode, near);
- assertSchemaException(new RunnableX() {
- @Override public void run() throws Exception {
- dynamicIndexDrop(randomString(), "my_idx", false);
- }
- }, SchemaOperationException.CODE_CACHE_NOT_FOUND);
+ try {
+ queryProcessor(node()).dynamicIndexDrop(randomString(), "my_idx", false).get();
+ }
+ catch (SchemaOperationException e) {
+ assertEquals(SchemaOperationException.CODE_CACHE_NOT_FOUND, e.code());
- assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
+ assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
+
+ return;
+ }
+ catch (Exception e) {
+ fail("Unexpected exception: " + e);
+ }
+
+ fail(SchemaOperationException.class.getSimpleName() + " is not thrown.");
}
/**
@@ -947,6 +969,39 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
}
/**
+ * Ensure that schema exception is thrown.
+ *
+ * @param r Runnable.
+ * @param expCode Error code.
+ */
+ protected static void assertSchemaException(RunnableX r, int expCode) {
+ try {
+ r.run();
+ }
+ catch (CacheException e) {
+ Throwable cause = e.getCause();
+
+ assertTrue(cause != null);
+ assertTrue("Unexpected cause: " + cause.getClass().getName(), cause instanceof IgniteSQLException);
+
+ IgniteSQLException cause0 = (IgniteSQLException)cause;
+
+ int code = cause0.statusCode();
+
+ // TODO: Re-enable.
+// assertEquals("Unexpected error code [expected=" + expCode + ", actual=" + e.code() + ']',
+// expCode, e.code());
+
+ return;
+ }
+ catch (Exception e) {
+ fail("Unexpected exception: " + e);
+ }
+
+ fail(IgniteSQLException.class.getSimpleName() + " is not thrown.");
+ }
+
+ /**
* Synchronously create index.
*
* @param space Space.
@@ -957,7 +1012,30 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
*/
private void dynamicIndexCreate(String space, String tblName, QueryIndex idx, boolean ifNotExists)
throws Exception {
- queryProcessor(node()).dynamicIndexCreate(space, tblName, idx, ifNotExists).get();
+ GridStringBuilder sql = new SB("CREATE INDEX ")
+ .a(ifNotExists ? "IF NOT EXISTS " : "")
+ .a("\"" + idx.getName() + "\"")
+ .a(" ON ")
+ .a(tblName)
+ .a(" (");
+
+ boolean first = true;
+
+ for (Map.Entry<String, Boolean> fieldEntry : idx.getFields().entrySet()) {
+ if (first)
+ first = false;
+ else
+ sql.a(", ");
+
+ String name = fieldEntry.getKey();
+ boolean asc = fieldEntry.getValue();
+
+ sql.a("\"" + name + "\"").a(" ").a(asc ? "ASC" : "DESC");
+ }
+
+ sql.a(')');
+
+ executeSql(space, sql.toString());
}
/**
@@ -969,6 +1047,20 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
* @throws Exception if failed.
*/
private void dynamicIndexDrop(String space, String idxName, boolean ifExists) throws Exception {
- queryProcessor(node()).dynamicIndexDrop(space, idxName, ifExists).get();
+ String sql = "DROP INDEX " + (ifExists ? "IF EXISTS " : "") + "\"" + idxName + "\"";
+
+ executeSql(space, sql);
+ }
+
+ /**
+ * Execute SQL.
+ *
+ * @param space Space.
+ * @param sql SQL.
+ */
+ private void executeSql(String space, String sql) {
+ log.info("Executing DDL: " + sql);
+
+ node().cache(space).query(new SqlFieldsQuery(sql)).getAll();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db61e86/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
index e52e0d3..caa3c07 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
@@ -29,9 +29,10 @@ import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.MemoryConfiguration;
+import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.internal.processors.query.schema.SchemaOperationException;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -135,6 +136,13 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes
cfg.setMarshaller(new BinaryMarshaller());
+ MemoryConfiguration memCfg = new MemoryConfiguration()
+ .setDefaultMemoryPolicyName("default")
+ .setMemoryPolicies(new MemoryPolicyConfiguration().setName("default").setSize(32 * 1024 * 1024L)
+ );
+
+ cfg.setMemoryConfiguration(memCfg);
+
return optimize(cfg);
}
@@ -168,29 +176,6 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes
}
/**
- * Ensure that schema exception is thrown.
- *
- * @param r Runnable.
- * @param expCode Error code.
- */
- protected static void assertSchemaException(RunnableX r, int expCode) {
- try {
- r.run();
- }
- catch (SchemaOperationException e) {
- assertEquals("Unexpected error code [expected=" + expCode + ", actual=" + e.code() + ']',
- expCode, e.code());
-
- return;
- }
- catch (Exception e) {
- fail("Unexpected exception: " + e);
- }
-
- fail(SchemaOperationException.class.getSimpleName() + " is not thrown.");
- }
-
- /**
* Ensure index is used in plan.
*
* @param idxName Index name.
[3/3] ignite git commit: Done.
Posted by vo...@apache.org.
Done.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35e9bbdb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35e9bbdb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35e9bbdb
Branch: refs/heads/ignite-5033
Commit: 35e9bbdb6b4d93731906f5e61d660c29eb937430
Parents: 3db61e8
Author: devozerov <vo...@gridgain.com>
Authored: Wed Apr 19 19:37:30 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Apr 19 19:37:30 2017 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 19 +++++++++++--------
.../DynamicIndexAbstractBasicSelfTest.java | 20 ++++++++++----------
.../index/DynamicIndexAbstractSelfTest.java | 2 +-
4 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e9bbdb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 4f0a9f9..87b0d00 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1717,7 +1717,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
if (DdlStatementsProcessor.isDdlStatement(prepared)) {
try {
- return ddlProc.runDdlStatement(stmt);
+ return ddlProc.runDdlStatement(sqlQry, stmt);
}
catch (IgniteCheckedException e) {
throw new IgniteSQLException("Failed to execute DDL statement [stmt=" + sqlQry + ']', e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e9bbdb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
index 5b4b494..949ea6a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
@@ -71,10 +71,11 @@ public class DdlStatementsProcessor {
/**
* Execute DDL statement.
*
+ * @param sql SQL.
* @param stmt H2 statement to parse and execute.
*/
@SuppressWarnings("unchecked")
- public QueryCursor<List<?>> runDdlStatement(PreparedStatement stmt)
+ public QueryCursor<List<?>> runDdlStatement(String sql, PreparedStatement stmt)
throws IgniteCheckedException {
assert stmt instanceof JdbcPreparedStatement;
@@ -99,8 +100,8 @@ public class DdlStatementsProcessor {
GridH2Table tbl = idx.dataTable(createIdx.schemaName(), createIdx.tableName());
if (tbl == null)
- throw new IgniteSQLException("Table not found [schemaName=" + createIdx.schemaName() + ", " +
- "tblName=" + createIdx.tableName() + ']', IgniteQueryErrorCode.TABLE_NOT_FOUND);
+ throw new SchemaOperationException(SchemaOperationException.CODE_TABLE_NOT_FOUND,
+ createIdx.tableName());
assert tbl.rowDescriptor() != null;
@@ -111,8 +112,7 @@ public class DdlStatementsProcessor {
GridQueryProperty prop = typeDesc.property(e.getKey());
if (prop == null)
- throw new IgniteSQLException("Property not found [typeName=" + typeDesc.name() + ", propName=" +
- e.getKey() + ']');
+ throw new SchemaOperationException(SchemaOperationException.CODE_COLUMN_NOT_FOUND, e.getKey());
flds.put(prop.name(), e.getValue());
}
@@ -129,8 +129,8 @@ public class DdlStatementsProcessor {
fut = ctx.query().dynamicIndexDrop(spaceName, dropIdx.name(), dropIdx.ifExists());
}
else
- throw new IgniteSQLException("Unexpected DDL operation [type=" + gridStmt.getClass() + ']',
- IgniteQueryErrorCode.UNEXPECTED_OPERATION);
+ throw new IgniteSQLException("Unsupported DDL operation: " + sql,
+ IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
fut.get();
@@ -144,8 +144,11 @@ public class DdlStatementsProcessor {
catch (SchemaOperationException e) {
throw convert(e);
}
+ catch (IgniteSQLException e) {
+ throw e;
+ }
catch (Exception e) {
- throw new IgniteSQLException("DLL operation failed.", e);
+ throw new IgniteSQLException("Unexpected DLL operation failure: " + e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e9bbdb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
index 94dc831..fc3529b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
import org.apache.ignite.internal.processors.query.schema.SchemaOperationException;
import org.apache.ignite.internal.util.GridStringBuilder;
@@ -197,7 +198,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
- }, SchemaOperationException.CODE_INDEX_EXISTS);
+ }, IgniteQueryErrorCode.INDEX_ALREADY_EXISTS);
dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true);
assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, field(FIELD_NAME_1));
@@ -437,7 +438,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexCreate(CACHE_NAME, randomString(), idx, false);
}
- }, SchemaOperationException.CODE_TABLE_NOT_FOUND);
+ }, IgniteQueryErrorCode.TABLE_NOT_FOUND);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
}
@@ -513,7 +514,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
- }, SchemaOperationException.CODE_COLUMN_NOT_FOUND);
+ }, IgniteQueryErrorCode.COLUMN_NOT_FOUND);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
}
@@ -590,7 +591,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, false);
}
- }, SchemaOperationException.CODE_COLUMN_NOT_FOUND);
+ }, IgniteQueryErrorCode.COLUMN_NOT_FOUND);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
@@ -757,7 +758,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, false);
}
- }, SchemaOperationException.CODE_INDEX_NOT_FOUND);
+ }, IgniteQueryErrorCode.INDEX_NOT_FOUND);
dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
@@ -864,7 +865,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexCreate(CACHE_NAME, TBL_NAME, idx, true);
}
- }, SchemaOperationException.CODE_GENERIC);
+ }, IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
assertNoIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1);
@@ -872,7 +873,7 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
@Override public void run() throws Exception {
dynamicIndexDrop(CACHE_NAME, IDX_NAME_1, true);
}
- }, SchemaOperationException.CODE_GENERIC);
+ }, IgniteQueryErrorCode.UNSUPPORTED_OPERATION);
}
/**
@@ -988,9 +989,8 @@ public abstract class DynamicIndexAbstractBasicSelfTest extends DynamicIndexAbst
int code = cause0.statusCode();
- // TODO: Re-enable.
-// assertEquals("Unexpected error code [expected=" + expCode + ", actual=" + e.code() + ']',
-// expCode, e.code());
+ assertEquals("Unexpected error code [expected=" + expCode + ", actual=" + code +
+ ", msg=" + cause.getMessage() + ']', expCode, code);
return;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35e9bbdb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
index caa3c07..1ed7426 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
@@ -359,7 +359,7 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes
* @return Random string.
*/
protected static String randomString() {
- return UUID.randomUUID().toString();
+ return "random" + UUID.randomUUID().toString().replace("-", "");
}
/**