You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/29 16:27:53 UTC
[1/4] ignite git commit: ignite-3477-master remove
BinaryObjectExceptionSelfTest (unnecessary) update import
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master d0a59309a -> 610799288
ignite-3477-master remove BinaryObjectExceptionSelfTest (unnecessary) update import
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1351d5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1351d5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1351d5a
Branch: refs/heads/ignite-3477-master
Commit: f1351d5a675a9eb22c71c54c5c25fa3b5592cdf9
Parents: 9f9639a
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Mar 29 15:40:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:26:19 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f1351d5a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 1a348e0..3496dbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -33,7 +33,6 @@ import org.apache.ignite.internal.binary.BinaryMarshallerSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderAdditionalSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderDefaultMappersSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectBuilderSimpleNameLowerCaseMappersSelfTest;
-import org.apache.ignite.internal.binary.BinaryObjectExceptionSelfTest;
import org.apache.ignite.internal.binary.BinaryObjectToStringSelfTest;
import org.apache.ignite.internal.binary.BinarySerialiedFieldComparatorSelfTest;
import org.apache.ignite.internal.binary.BinarySimpleNameTestPropertySelfTest;
@@ -94,7 +93,6 @@ public class IgniteBinaryObjectsTestSuite extends TestSuite {
suite.addTestSuite(BinaryTreeSelfTest.class);
suite.addTestSuite(BinaryMarshallerSelfTest.class);
- suite.addTestSuite(BinaryObjectExceptionSelfTest.class);
suite.addTestSuite(BinarySerialiedFieldComparatorSelfTest.class);
suite.addTestSuite(BinaryArrayIdentityResolverSelfTest.class);
[2/4] ignite git commit: ignite-3477-master remove
BinaryObjectExceptionSelfTest (unnecessary)
Posted by ag...@apache.org.
ignite-3477-master remove BinaryObjectExceptionSelfTest (unnecessary)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f9639a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f9639a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f9639a3
Branch: refs/heads/ignite-3477-master
Commit: 9f9639a3fe639e7eb8e5c02bde9acc693124024e
Parents: 48e7123
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Mar 29 15:38:18 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:26:19 2017 +0300
----------------------------------------------------------------------
.../binary/BinaryObjectExceptionSelfTest.java | 209 -------------------
1 file changed, 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f9639a3/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
deleted file mode 100644
index e4be824..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
+++ /dev/null
@@ -1,209 +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.binary;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.UUID;
-import javax.cache.Cache;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.binary.BinaryBasicNameMapper;
-import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.configuration.BinaryConfiguration;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-
-/**
- * BinaryObjectExceptionSelfTest
- */
-public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
- /** */
- private static final String TEST_KEY = "test_key";
-
- /** */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- cfg.setMarshaller(new BinaryMarshaller());
- cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
-
- cfg.setCacheConfiguration(new CacheConfiguration().setCopyOnRead(true));
-
- BinaryConfiguration bcfg = new BinaryConfiguration();
-
- bcfg.setNameMapper(new BinaryBasicNameMapper(false));
-
- cfg.setBinaryConfiguration(bcfg);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- startGrids(2);
-
- awaitPartitionMapExchange();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- stopAllGrids();
- }
-
- /**
- * Test unexpected field type.
- *
- * @throws Exception If failed.
- */
- @SuppressWarnings("WhileLoopReplaceableByForEach")
- public void testUnexpectedFieldType() throws Exception {
- IgniteEx grid = grid(0);
-
- IgniteCache<String, Value> cache = grid.cache(null);
-
- cache.put(TEST_KEY, new Value());
-
- BinaryObjectImpl b = (BinaryObjectImpl)cache.withKeepBinary().get(TEST_KEY);
-
- b.deserialize(); // deserialize working
-
- byte[] a = b.array();
-
- int unexpectedCnt = 0;
-
- Field[] fields = Value.class.getDeclaredFields();
-
- StringBuilder sb = new StringBuilder(4 << 10);
-
- for (int i = b.dataStartOffset(), j = b.footerStartOffset(); i < j; ++i) {
- byte old = a[i];
-
- a[i] = -1;
-
- try {
- Iterator<Cache.Entry<String, Value>> it = cache.iterator();
-
- while (it.hasNext())
- it.next();
- }
- catch (Exception ex) {
- Throwable root = ex;
-
- sb.setLength(0);
-
- sb.append(root.getMessage());
-
- while (root.getCause() != null) {
- root = root.getCause();
-
- sb.append(". ").append(root.getMessage());
- }
- if (root instanceof BinaryObjectException && root.getMessage().startsWith("Unexpected field type")) {
- log().info(sb.toString());
-
- Field f = fields[unexpectedCnt];
-
- Throwable t = ex;
-
- assertTrue(t.getMessage(), t.getMessage().contains(
- "object [typeName=org.apache.ignite.internal.binary.BinaryObjectExceptionSelfTest$Value"));
-
- t = t.getCause();
-
- assertTrue(t.getMessage(), t.getMessage().contains("field [name=" + f.getName()));
-
- ++unexpectedCnt;
- }
- else
- log().info("Ignored exception: " + sb);
- }
-
- a[i] = old;
- }
-
- assertEquals("Fields count must match \"Unexpected field type\" exception count", fields.length, unexpectedCnt);
- }
-
- /** */
- private enum EnumValues {
- /** */
- val1,
-
- /** */
- val2,
-
- /** */
- val3;
- }
-
- /** */
- @SuppressWarnings("unused")
- private static class Value {
- /** */
- public byte byteVal = 1;
-
- /** */
- public boolean booleanVal = true;
-
- /** */
- public short shortVal = 2;
-
- /** */
- public char charVal = 'Q';
-
- /** */
- public int intVal = 3;
-
- /** */
- public long longVal = 4;
-
- /** */
- public float floatVal = 5;
-
- /** */
- public double doubleVal = 6;
-
- /** */
- public BigDecimal bigDecimal = new BigDecimal(7);
-
- /** */
- public String string = "QWERTY";
-
- /** */
- public UUID uuid = UUID.randomUUID();
-
- /** */
- public Date date = new Date();
-
- /** */
- public Timestamp timestamp = new Timestamp(date.getTime() + 1000L);
-
- /** */
- public EnumValues enumVal = EnumValues.val2;
- }
-}
[3/4] ignite git commit: ignite-3477-master fix testLocalTransactional
Posted by ag...@apache.org.
ignite-3477-master fix testLocalTransactional
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48e71237
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48e71237
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48e71237
Branch: refs/heads/ignite-3477-master
Commit: 48e712377ee48da2b84fbf7f58e2b5a2430ebdc8
Parents: d0a5930
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Mar 29 15:36:17 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:26:19 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxManager.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48e71237/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index dc70a98..2c46d52 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1564,6 +1564,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
boolean read = serOrder != null && txEntry1.op() == READ;
+ entry1.unswap();
+
if (!entry1.tmLock(tx, timeout, serOrder, serReadVer, read)) {
// Unlock locks locked so far.
for (IgniteTxEntry txEntry2 : entries) {
[4/4] ignite git commit: schema usage is fixed
Posted by ag...@apache.org.
schema usage is fixed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61079928
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61079928
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61079928
Branch: refs/heads/ignite-3477-master
Commit: 610799288756d7fce1fa0a0032669cf714eee51f
Parents: f1351d5
Author: Sergey Chugunov <se...@gmail.com>
Authored: Wed Mar 29 19:03:00 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:26:20 2017 +0300
----------------------------------------------------------------------
.../query/h2/sql/GridQueryParsingTest.java | 112 +++++++++----------
1 file changed, 53 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/61079928/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index a39337b..427008a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -53,12 +53,6 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** */
- private static final String TEST_SCHEMA = "SCH";
-
- /** */
- private static final String TEST_CACHE = "my-cache";
-
- /** */
private static Ignite ignite;
/** {@inheritDoc} */
@@ -73,8 +67,8 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
c.setDiscoverySpi(disco);
c.setCacheConfiguration(
- cacheConfiguration(null, String.class, Person.class),
- cacheConfiguration("addr", String.class, Address.class));
+ cacheConfiguration(null, "SCH1", String.class, Person.class),
+ cacheConfiguration("addr", "SCH2", String.class, Address.class));
return c;
}
@@ -85,7 +79,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
* @param clsV Value class.
* @return Cache configuration.
*/
- private CacheConfiguration cacheConfiguration(String name, Class<?> clsK, Class<?> clsV) {
+ private CacheConfiguration cacheConfiguration(String name, String sqlSchema, Class<?> clsK, Class<?> clsV) {
CacheConfiguration cc = defaultCacheConfiguration();
cc.setName(name);
@@ -94,7 +88,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
cc.setNearConfiguration(null);
cc.setWriteSynchronizationMode(FULL_SYNC);
cc.setRebalanceMode(SYNC);
- cc.setSqlSchema(TEST_SCHEMA);
+ cc.setSqlSchema(sqlSchema);
cc.setSqlFunctionClasses(GridQueryParsingTest.class);
cc.setIndexedTypes(clsK, clsV);
@@ -164,18 +158,18 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select * from table0('aaa', 100) x left join table0('bbb', 100) y on x.a=y.a where x.b = 'bbb'");
checkQuery("select * from table0('aaa', 100) x left join table0('bbb', 100) y where x.b = 'bbb'");
- checkQuery("select avg(old) from Person left join \"addr\".Address on Person.addrId = Address.id " +
+ checkQuery("select avg(old) from Person left join sch2.Address on Person.addrId = Address.id " +
"where lower(Address.street) = lower(?)");
- checkQuery("select avg(old) from Person join \"addr\".Address on Person.addrId = Address.id " +
+ checkQuery("select avg(old) from sch1.Person join sch2.Address on Person.addrId = Address.id " +
"where lower(Address.street) = lower(?)");
- checkQuery("select avg(old) from Person left join \"addr\".Address where Person.addrId = Address.id " +
+ checkQuery("select avg(old) from Person left join sch2.Address where Person.addrId = Address.id " +
"and lower(Address.street) = lower(?)");
- checkQuery("select avg(old) from Person right join \"addr\".Address where Person.addrId = Address.id " +
+ checkQuery("select avg(old) from Person right join sch2.Address where Person.addrId = Address.id " +
"and lower(Address.street) = lower(?)");
- checkQuery("select avg(old) from Person, \"addr\".Address where Person.addrId = Address.id " +
+ checkQuery("select avg(old) from Person, sch2.Address where Person.addrId = Address.id " +
"and lower(Address.street) = lower(?)");
checkQuery("select name, name, date, date d from Person");
@@ -185,19 +179,19 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select distinct * from Person");
checkQuery("select p.name, date from Person p");
- checkQuery("select * from Person p, \"addr\".Address a");
- checkQuery("select * from Person, \"addr\".Address");
- checkQuery("select p.* from Person p, \"addr\".Address a");
- checkQuery("select person.* from Person, \"addr\".Address a");
- checkQuery("select p.*, street from Person p, \"addr\".Address a");
- checkQuery("select p.name, a.street from Person p, \"addr\".Address a");
- checkQuery("select p.name, a.street from \"addr\".Address a, Person p");
- checkQuery("select distinct p.name, a.street from Person p, \"addr\".Address a");
- checkQuery("select distinct name, street from Person, \"addr\".Address group by old");
- checkQuery("select distinct name, street from Person, \"addr\".Address");
- checkQuery("select p1.name, a2.street from Person p1, \"addr\".Address a1, Person p2, \"addr\".Address a2");
-
- checkQuery("select p.name n, a.street s from Person p, \"addr\".Address a");
+ checkQuery("select * from Person p, sch2.Address a");
+ checkQuery("select * from Person, sch2.Address");
+ checkQuery("select p.* from Person p, sch2.Address a");
+ checkQuery("select person.* from Person, sch2.Address a");
+ checkQuery("select p.*, street from Person p, sch2.Address a");
+ checkQuery("select p.name, a.street from Person p, sch2.Address a");
+ checkQuery("select p.name, a.street from sch2.Address a, Person p");
+ checkQuery("select distinct p.name, a.street from Person p, sch2.Address a");
+ checkQuery("select distinct name, street from Person, sch2.Address group by old");
+ checkQuery("select distinct name, street from Person, sch2.Address");
+ checkQuery("select p1.name, a2.street from Person p1, sch2.Address a1, Person p2, sch2.Address a2");
+
+ checkQuery("select p.name n, a.street s from Person p, sch2.Address a");
checkQuery("select p.name, 1 as i, 'aaa' s from Person p");
checkQuery("select p.name + 'a', 1 * 3 as i, 'aaa' s, -p.old, -p.old as old from Person p");
@@ -209,7 +203,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select p.name from Person p where name <> 'ivan'");
checkQuery("select p.name from Person p where name like 'i%'");
checkQuery("select p.name from Person p where name regexp 'i%'");
- checkQuery("select p.name from Person p, \"addr\".Address a " +
+ checkQuery("select p.name from Person p, sch2.Address a " +
"where p.name <> 'ivan' and a.id > 10 or not (a.id = 100)");
checkQuery("select case p.name when 'a' then 1 when 'a' then 2 end as a from Person p");
@@ -223,10 +217,10 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select * from Person p where p.name in ('a', 'b', '_' + RAND())"); // test ConditionIn
checkQuery("select * from Person p where p.name in ('a', 'b', 'c')"); // test ConditionInConstantSet
// test ConditionInConstantSet
- checkQuery("select * from Person p where p.name in (select a.street from \"addr\".Address a)");
+ checkQuery("select * from Person p where p.name in (select a.street from sch2.Address a)");
// test ConditionInConstantSet
- checkQuery("select (select a.street from \"addr\".Address a where a.id = p.addrId) from Person p");
+ checkQuery("select (select a.street from sch2.Address a where a.id = p.addrId) from Person p");
checkQuery("select p.name, ? from Person p where name regexp ? and p.old < ?");
@@ -258,36 +252,36 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("select p.name n from Person p order by p.old + 10, p.name");
checkQuery("select p.name n from Person p order by p.old + 10, p.name desc");
- checkQuery("select p.name n from Person p, (select a.street from \"addr\".Address a " +
+ checkQuery("select p.name n from Person p, (select a.street from sch2.Address a " +
"where a.street is not null) ");
- checkQuery("select street from Person p, (select a.street from \"addr\".Address a " +
+ checkQuery("select street from Person p, (select a.street from sch2.Address a " +
"where a.street is not null) ");
- checkQuery("select addr.street from Person p, (select a.street from \"addr\".Address a " +
+ checkQuery("select addr.street from Person p, (select a.street from sch2.Address a " +
"where a.street is not null) addr");
- checkQuery("select p.name n from sch.Person p order by p.old + 10");
+ checkQuery("select p.name n from sch1.Person p order by p.old + 10");
- checkQuery("select case when p.name is null then 'Vasya' end x from sch.Person p");
- checkQuery("select case when p.name like 'V%' then 'Vasya' else 'Other' end x from sch.Person p");
+ checkQuery("select case when p.name is null then 'Vasya' end x from sch1.Person p");
+ checkQuery("select case when p.name like 'V%' then 'Vasya' else 'Other' end x from sch1.Person p");
checkQuery("select case when upper(p.name) = 'VASYA' then 'Vasya' " +
- "when p.name is not null then p.name else 'Other' end x from sch.Person p");
+ "when p.name is not null then p.name else 'Other' end x from sch1.Person p");
- checkQuery("select case p.name when 'Vasya' then 1 end z from sch.Person p");
- checkQuery("select case p.name when 'Vasya' then 1 when 'Petya' then 2 end z from sch.Person p");
- checkQuery("select case p.name when 'Vasya' then 1 when 'Petya' then 2 else 3 end z from sch.Person p");
- checkQuery("select case p.name when 'Vasya' then 1 else 3 end z from sch.Person p");
+ checkQuery("select case p.name when 'Vasya' then 1 end z from sch1.Person p");
+ checkQuery("select case p.name when 'Vasya' then 1 when 'Petya' then 2 end z from sch1.Person p");
+ checkQuery("select case p.name when 'Vasya' then 1 when 'Petya' then 2 else 3 end z from sch1.Person p");
+ checkQuery("select case p.name when 'Vasya' then 1 else 3 end z from sch1.Person p");
- checkQuery("select count(*) as a from Person union select count(*) as a from \"addr\".Address");
+ checkQuery("select count(*) as a from Person union select count(*) as a from sch2.Address");
checkQuery("select old, count(*) as a from Person group by old union select 1, count(*) as a " +
- "from \"addr\".Address");
- checkQuery("select name from Person MINUS select street from \"addr\".Address");
- checkQuery("select name from Person EXCEPT select street from \"addr\".Address");
- checkQuery("select name from Person INTERSECT select street from \"addr\".Address");
- checkQuery("select name from Person UNION select street from \"addr\".Address limit 5");
- checkQuery("select name from Person UNION select street from \"addr\".Address limit ?");
- checkQuery("select name from Person UNION select street from \"addr\".Address limit ? offset ?");
+ "from sch2.Address");
+ checkQuery("select name from Person MINUS select street from sch2.Address");
+ checkQuery("select name from Person EXCEPT select street from sch2.Address");
+ checkQuery("select name from Person INTERSECT select street from sch2.Address");
+ checkQuery("select name from Person UNION select street from sch2.Address limit 5");
+ checkQuery("select name from Person UNION select street from sch2.Address limit ?");
+ checkQuery("select name from Person UNION select street from sch2.Address limit ? offset ?");
checkQuery("(select name from Person limit 4) " +
- "UNION (select street from \"addr\".Address limit 1) limit ? offset ?");
+ "UNION (select street from sch2.Address limit 1) limit ? offset ?");
checkQuery("(select 2 a) union all (select 1) order by 1");
checkQuery("(select 2 a) union all (select 1) order by a desc nulls first limit ? offset ?");
@@ -295,12 +289,12 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
// checkQuery("select sch.\"#\".\"@\" from (select 1 as \"@\") \"#\""); // Illegal query.
checkQuery("select \"#\".\"@\" from (select 1 as \"@\") \"#\"");
checkQuery("select \"@\" from (select 1 as \"@\") \"#\"");
- checkQuery("select sch.\"#\".old from sch.Person \"#\"");
- checkQuery("select sch.\"#\".old from Person \"#\"");
+ checkQuery("select sch1.\"#\".old from sch1.Person \"#\"");
+ checkQuery("select sch1.\"#\".old from Person \"#\"");
checkQuery("select \"#\".old from Person \"#\"");
checkQuery("select old from Person \"#\"");
// checkQuery("select Person.old from Person \"#\""); // Illegal query.
- checkQuery("select sch.\"#\".* from Person \"#\"");
+ checkQuery("select \"#\".* from Person \"#\"");
}
/**
@@ -365,7 +359,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("merge into Person(old, name) select 5, 'John'");
checkQuery("merge into Person(old, name) select p1.old, 'Name' from person p1 join person p2 on " +
"p2.name = p1.parentName where p2.old > 30");
- checkQuery("merge into Person(old) select 5 from Person UNION select street from \"addr\".Address limit ? offset ?");
+ checkQuery("merge into Person(old) select 5 from Person UNION select street from sch2.Address limit ? offset ?");
}
/** */
@@ -406,7 +400,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("insert into Person(old, name) select 5, 'John'");
checkQuery("insert into Person(old, name) select p1.old, 'Name' from person p1 join person p2 on " +
"p2.name = p1.parentName where p2.old > 30");
- checkQuery("insert into Person(old) select 5 from Person UNION select street from \"addr\".Address limit ? offset ?");
+ checkQuery("insert into Person(old) select 5 from Person UNION select street from sch2.Address limit ? offset ?");
}
/** */
@@ -428,10 +422,10 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("update Person p set name='Peter', old = length('zzz') limit 20");
checkQuery("update Person p set name=DEFAULT, old = null limit ?");
checkQuery("update Person p set name=? where old >= ? and old < ? limit ?");
- checkQuery("update Person p set name=(select a.Street from \"addr\".Address a where a.id=p.addrId), old = (select 42)" +
+ checkQuery("update Person p set name=(select a.Street from sch2.Address a where a.id=p.addrId), old = (select 42)" +
" where old = sqrt(?)");
checkQuery("update Person p set (name, old) = (select 'Peter', 42)");
- checkQuery("update Person p set (name, old) = (select street, id from \"addr\".Address where id > 5 and id <= ?)");
+ checkQuery("update Person p set (name, old) = (select street, id from sch2.Address where id > 5 and id <= ?)");
}
/**
@@ -444,7 +438,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
IgniteH2Indexing idx = U.field(qryProcessor, "idx");
- return (JdbcConnection)idx.connectionForSpace(TEST_CACHE);
+ return (JdbcConnection)idx.connectionForSpace(null);
}
/**