From e930dfa54112a5374ac4acd6c6ac88510fa9d3e9 Mon Sep 17 00:00:00 2001 From: Alexander Paschenko Date: Wed, 11 Jan 2017 04:12:58 +0800 Subject: [PATCH] IGNITE-4531 Use correct property name in BinaryProperty. --- .../processors/query/GridQueryProcessor.java | 2 +- ...iteCacheAbstractInsertSqlQuerySelfTest.java | 14 +++++++------- ...IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +++--- .../IgniteCacheInsertSqlQuerySelfTest.java | 18 ++++++++++-------- .../IgniteCacheMergeSqlQuerySelfTest.java | 14 +++++++------- .../IgniteCacheUpdateSqlQuerySelfTest.java | 4 ++-- 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 58f94f4367b09..3286bacbe4680 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -2147,7 +2147,7 @@ else if (val instanceof BinaryObject && ((BinaryObject)val).hasField(propName)) if (!(obj instanceof BinaryObjectBuilder)) throw new UnsupportedOperationException("Individual properties can be set for binary builders only"); - setValue0((BinaryObjectBuilder) obj, name(), propVal, type()); + setValue0((BinaryObjectBuilder) obj, propName, propVal, type()); } /** diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java index df4259e94c24b..86d01c788ee5b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java @@ -151,7 +151,7 @@ final void createBinaryCaches() { LinkedHashMap flds = new LinkedHashMap<>(); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); s2p.setFields(flds); @@ -172,7 +172,7 @@ final void createBinaryCaches() { LinkedHashMap flds = new LinkedHashMap<>(); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); i2p.setFields(flds); @@ -194,7 +194,7 @@ final void createBinaryCaches() { flds.put("key", Integer.class.getName()); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); k2p.setFields(flds); @@ -216,7 +216,7 @@ final void createBinaryCaches() { flds.put("Id", Integer.class.getName()); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); flds.put("IntVal", Integer.class.getName()); k22p.setFields(flds); @@ -240,7 +240,7 @@ final void createBinaryCaches() { flds.put("key", Integer.class.getName()); flds.put("strKey", String.class.getName()); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); k32p.setFields(flds); @@ -263,7 +263,7 @@ final void createBinaryCaches() { flds.put("key", Integer.class.getName()); flds.put("strKey", String.class.getName()); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); k42p.setFields(flds); @@ -515,7 +515,7 @@ public Person(int id) { protected int id; /** */ - @QuerySqlField + @QuerySqlField(name = "firstName") protected String name; /** {@inheritDoc} */ diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java index 7f79ec4623206..649012fd545c6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java @@ -139,7 +139,7 @@ private Object createBinPerson(int id, String name, String secondName) { BinaryObjectBuilder bldr = ignite(0).binary().builder("Person"); bldr.setField("id", id); - bldr.setField("name", name); + bldr.setField("firstName", name); bldr.setField("secondName", secondName); return bldr.build(); @@ -186,7 +186,7 @@ private static CacheConfiguration createBinCacheConfig() { LinkedHashMap flds = new LinkedHashMap<>(); flds.put("id", Integer.class.getName()); - flds.put("name", String.class.getName()); + flds.put("firstName", String.class.getName()); flds.put("secondName", String.class.getName()); e.setFields(flds); @@ -214,7 +214,7 @@ public Person(int id, String name, String secondName) { protected int id; /** */ - @QuerySqlField + @QuerySqlField(name = "firstName") protected final String name; /** */ diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java index 04a352fd24940..e9c21dc2cea5d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInsertSqlQuerySelfTest.java @@ -56,7 +56,7 @@ public class IgniteCacheInsertSqlQuerySelfTest extends IgniteCacheAbstractInsert public void testInsertWithExplicitKey() { IgniteCache p = ignite(0).cache("S2P").withKeepBinary(); - p.query(new SqlFieldsQuery("insert into Person (_key, id, name) values ('s', ?, ?), " + + p.query(new SqlFieldsQuery("insert into Person (_key, id, firstName) values ('s', ?, ?), " + "('a', 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get("s")); @@ -76,7 +76,7 @@ public void testInsertFromSubquery() { assertEquals("Sergi", p.get("s")); assertEquals("Alex", p.get("a")); - p.query(new SqlFieldsQuery("insert into Person(_key, id, name) " + + p.query(new SqlFieldsQuery("insert into Person(_key, id, firstName) " + "(select substring(lower(_val), 0, 2), cast(length(_val) as int), _val from String)")); assertEquals(createPerson(5, "Sergi"), p.get("se")); @@ -91,7 +91,7 @@ public void testInsertWithExplicitPrimitiveKey() { IgniteCache p = ignite(0).cache("I2P").withKeepBinary(); p.query(new SqlFieldsQuery( - "insert into Person (_key, id, name) values (cast('1' as int), ?, ?), (2, (5 - 3), 'Alex')") + "insert into Person (_key, id, firstName) values (cast('1' as int), ?, ?), (2, (5 - 3), 'Alex')") .setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(1)); @@ -106,7 +106,7 @@ public void testInsertWithDynamicKeyInstantiation() { IgniteCache p = ignite(0).cache("K2P").withKeepBinary(); p.query(new SqlFieldsQuery( - "insert into Person (key, id, name) values (1, ?, ?), (2, 2, 'Alex')").setArgs(1, "Sergi")); + "insert into Person (key, id, firstName) values (1, ?, ?), (2, 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key(1))); @@ -119,8 +119,8 @@ public void testInsertWithDynamicKeyInstantiation() { public void testFieldsCaseSensitivity() { IgniteCache p = ignite(0).cache("K22P").withKeepBinary(); - p.query(new SqlFieldsQuery("insert into \"Person2\" (\"Id\", \"id\", \"name\", \"IntVal\") values (1, ?, ?, 5), " + - "(2, 3, 'Alex', 6)").setArgs(4, "Sergi")); + p.query(new SqlFieldsQuery("insert into \"Person2\" (\"Id\", \"id\", \"firstName\", \"IntVal\") " + + "values (1, ?, ?, 5), (2, 3, 'Alex', 6)").setArgs(4, "Sergi")); assertEquals(createPerson2(4, "Sergi", 5), p.get(new Key2(1))); @@ -177,7 +177,8 @@ public void testFieldsListIdentity() { IgniteCache p = ignite(0).cache("K32P").withKeepBinary(); p.query(new SqlFieldsQuery( - "insert into Person (key, strKey, id, name) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); + "insert into Person (key, strKey, id, firstName) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')") + .setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key3(1))); @@ -194,7 +195,8 @@ public void testCustomIdentity() { IgniteCache p = ignite(0).cache("K42P").withKeepBinary(); p.query(new SqlFieldsQuery( - "insert into Person (key, strKey, id, name) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); + "insert into Person (key, strKey, id, firstName) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')") + .setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key4(1))); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java index 0ff3fda0da87f..58d07af25ce3f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQuerySelfTest.java @@ -32,7 +32,7 @@ public class IgniteCacheMergeSqlQuerySelfTest extends IgniteCacheAbstractInsertS public void testMergeWithExplicitKey() { IgniteCache p = ignite(0).cache("S2P").withKeepBinary(); - p.query(new SqlFieldsQuery("merge into Person (_key, id, name) values ('s', ?, ?), " + + p.query(new SqlFieldsQuery("merge into Person (_key, id, firstName) values ('s', ?, ?), " + "('a', 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get("s")); @@ -52,7 +52,7 @@ public void testMergeFromSubquery() { assertEquals("Sergi", p.get("s")); assertEquals("Alex", p.get("a")); - p.query(new SqlFieldsQuery("merge into Person(_key, id, name) " + + p.query(new SqlFieldsQuery("merge into Person(_key, id, firstName) " + "(select substring(lower(_val), 0, 2), cast(length(_val) as int), _val from String)")); assertEquals(createPerson(5, "Sergi"), p.get("se")); @@ -67,7 +67,7 @@ public void testMergeWithExplicitPrimitiveKey() { IgniteCache p = ignite(0).cache("I2P").withKeepBinary(); p.query(new SqlFieldsQuery( - "merge into Person (_key, id, name) values (cast(? as int), ?, ?), (2, (5 - 3), 'Alex')") + "merge into Person (_key, id, firstName) values (cast(? as int), ?, ?), (2, (5 - 3), 'Alex')") .setArgs("1", 1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(1)); @@ -82,7 +82,7 @@ public void testMergeWithDynamicKeyInstantiation() { IgniteCache p = ignite(0).cache("K2P").withKeepBinary(); p.query(new SqlFieldsQuery( - "merge into Person (key, id, name) values (1, ?, ?), (2, 2, 'Alex')").setArgs(1, "Sergi")); + "merge into Person (key, id, firstName) values (1, ?, ?), (2, 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key(1))); @@ -95,7 +95,7 @@ public void testMergeWithDynamicKeyInstantiation() { public void testFieldsCaseSensitivity() { IgniteCache p = ignite(0).cache("K22P").withKeepBinary(); - p.query(new SqlFieldsQuery("merge into \"Person2\" (\"Id\", \"id\", \"name\", \"IntVal\") values (1, ?, ?, 5), " + + p.query(new SqlFieldsQuery("merge into \"Person2\" (\"Id\", \"id\", \"firstName\", \"IntVal\") values (1, ?, ?, 5), " + "(2, 3, 'Alex', 6)").setArgs(4, "Sergi")); assertEquals(createPerson2(4, "Sergi", 5), p.get(new Key2(1))); @@ -127,7 +127,7 @@ public void testFieldsListIdentity() { IgniteCache p = ignite(0).cache("K32P").withKeepBinary(); p.query(new SqlFieldsQuery( - "merge into Person (key, strKey, id, name) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); + "merge into Person (key, strKey, id, firstName) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key3(1))); @@ -144,7 +144,7 @@ public void testCustomIdentity() { IgniteCache p = ignite(0).cache("K42P").withKeepBinary(); p.query(new SqlFieldsQuery( - "merge into Person (key, strKey, id, name) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); + "merge into Person (key, strKey, id, firstName) values (1, 'aa', ?, ?), (2, 'bb', 2, 'Alex')").setArgs(1, "Sergi")); assertEquals(createPerson(1, "Sergi"), p.get(new Key4(1))); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java index 332a082201512..58bcaacf2f741 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java @@ -61,8 +61,8 @@ private static CacheConfiguration createAllTypesCacheConfig() { public void testUpdateSimple() { IgniteCache p = cache(); - QueryCursor> c = p.query(new SqlFieldsQuery("update Person p set p.id = p.id * 2, p.name = " + - "substring(p.name, 0, 2) where length(p._key) = ? or p.secondName like ?").setArgs(2, "%ite")); + QueryCursor> c = p.query(new SqlFieldsQuery("update Person p set p.id = p.id * 2, p.firstName = " + + "substring(p.firstName, 0, 2) where length(p._key) = ? or p.secondName like ?").setArgs(2, "%ite")); c.iterator();