http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index ad3846f..e64363d 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -183,6 +183,7 @@ org.apache.ignite.igfs.mapreduce.records.IgfsByteDelimiterRecordResolver org.apache.ignite.igfs.mapreduce.records.IgfsFixedLengthRecordResolver org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver org.apache.ignite.igfs.mapreduce.records.IgfsStringDelimiterRecordResolver +org.apache.ignite.internal.DuplicateTypeIdException org.apache.ignite.internal.ExecutorAwareMessage org.apache.ignite.internal.GridClosureCallMode org.apache.ignite.internal.GridComponent$DiscoveryDataExchangeType @@ -310,6 +311,7 @@ org.apache.ignite.internal.jdbc2.JdbcDatabaseMetadata$UpdateMetadataTask org.apache.ignite.internal.jdbc2.JdbcQueryTask org.apache.ignite.internal.jdbc2.JdbcQueryTask$1 org.apache.ignite.internal.jdbc2.JdbcQueryTask$QueryResult +org.apache.ignite.internal.jdbc2.JdbcQueryTaskV2 org.apache.ignite.internal.jdbc2.JdbcSqlFieldsQuery org.apache.ignite.internal.managers.GridManagerAdapter$1$1 org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager$CheckpointSet @@ -341,7 +343,6 @@ org.apache.ignite.internal.mem.IgniteOutOfMemoryException org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl$Segment org.apache.ignite.internal.pagemem.wal.StorageException org.apache.ignite.internal.pagemem.wal.WALIterator -org.apache.ignite.internal.pagemem.wal.record.TxRecord$TxAction org.apache.ignite.internal.pagemem.wal.record.WALRecord$RecordType org.apache.ignite.internal.pagemem.wal.record.delta.DeltaApplicationException org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion @@ -569,7 +570,6 @@ org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManagerImpl$CacheD org.apache.ignite.internal.processors.cache.IgniteCacheProxy org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$1 -org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$1$1 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$2 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$3 org.apache.ignite.internal.processors.cache.IgniteCacheProxyImpl$4 @@ -585,6 +585,7 @@ org.apache.ignite.internal.processors.cache.StoredCacheData org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy org.apache.ignite.internal.processors.cache.binary.BinaryMetadataHolder org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey +org.apache.ignite.internal.processors.cache.binary.BinaryMetadataTransport$2 org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$3 org.apache.ignite.internal.processors.cache.binary.MetadataRequestMessage org.apache.ignite.internal.processors.cache.binary.MetadataResponseMessage @@ -905,6 +906,7 @@ org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogMan org.apache.ignite.internal.processors.cache.persistence.wal.SegmentEofException org.apache.ignite.internal.processors.cache.persistence.wal.crc.IgniteDataIntegrityViolationException org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneWalRecordsIterator +org.apache.ignite.internal.processors.cache.query.CacheQueryEntry org.apache.ignite.internal.processors.cache.query.CacheQueryType org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$1 @@ -919,8 +921,7 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$10 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$13$1 +org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$5 @@ -935,9 +936,9 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$Metadata org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$MetadataJob$3 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$PeekValueExpiryAwareIterator org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$RequestFutureMap$1 +org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$ScanQueryIterator org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsAdapter org.apache.ignite.internal.processors.cache.query.GridCacheQueryMetricsKey org.apache.ignite.internal.processors.cache.query.GridCacheQueryRequest @@ -1032,9 +1033,9 @@ org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry org.apache.ignite.internal.processors.cache.version.GridCacheVersion org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl -org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl +org.apache.ignite.internal.processors.cacheobject.UserCacheObjectByteArrayImpl +org.apache.ignite.internal.processors.cacheobject.UserCacheObjectImpl +org.apache.ignite.internal.processors.cacheobject.UserKeyCacheObjectImpl org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2 @@ -1264,6 +1265,7 @@ org.apache.ignite.internal.processors.marshaller.MappingProposedMessage$Proposal org.apache.ignite.internal.processors.marshaller.MarshallerMappingItem org.apache.ignite.internal.processors.marshaller.MissingMappingRequestMessage org.apache.ignite.internal.processors.marshaller.MissingMappingResponseMessage +org.apache.ignite.internal.processors.odbc.jdbc.JdbcStatementType org.apache.ignite.internal.processors.odbc.odbc.escape.OdbcEscapeType org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate @@ -1287,6 +1289,7 @@ org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQue org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryImpl org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryRemoteFilter +org.apache.ignite.internal.processors.platform.client.IgniteClientException org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilter org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilterImpl org.apache.ignite.internal.processors.platform.compute.PlatformAbstractJob @@ -1346,6 +1349,7 @@ org.apache.ignite.internal.processors.query.GridQueryProcessor$8 org.apache.ignite.internal.processors.query.GridQueryProcessor$9 org.apache.ignite.internal.processors.query.GridQueryProcessor$SchemaOperation$1 org.apache.ignite.internal.processors.query.IgniteSQLException +org.apache.ignite.internal.processors.query.QueryField org.apache.ignite.internal.processors.query.QueryIndexKey org.apache.ignite.internal.processors.query.QuerySchema org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest @@ -1359,7 +1363,9 @@ org.apache.ignite.internal.processors.query.schema.message.SchemaAbstractDiscove org.apache.ignite.internal.processors.query.schema.message.SchemaFinishDiscoveryMessage org.apache.ignite.internal.processors.query.schema.message.SchemaOperationStatusMessage org.apache.ignite.internal.processors.query.schema.message.SchemaProposeDiscoveryMessage +org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractAlterTableOperation org.apache.ignite.internal.processors.query.schema.operation.SchemaAbstractOperation +org.apache.ignite.internal.processors.query.schema.operation.SchemaAlterTableAddColumnOperation org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexAbstractOperation org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexCreateOperation org.apache.ignite.internal.processors.query.schema.operation.SchemaIndexDropOperation
http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 0241165..6712b5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -27,6 +27,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.eviction.EvictableEntry; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; +import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; @@ -831,6 +832,11 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr } /** {@inheritDoc} */ + @Override public CacheObject unswap(CacheDataRow row) throws IgniteCheckedException { + return null; + } + + /** {@inheritDoc} */ @Override public boolean hasLockCandidate(long threadId) throws GridCacheEntryRemovedException { return localCandidate(threadId) != null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/23104171/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java index 5041690..c378b6f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java @@ -27,6 +27,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SpiQuery; @@ -183,6 +184,46 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + public void testGetObjectFieldPartitioned() throws Exception { + IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); + + Affinity<Integer> affinity = affinity(cache); + + try { + int [] keys = new int[50]; + + for (int i = 0, j = 0; i < keys.length; j++) { + if (affinity.partition(j) == 0) + keys[i++] = j; + } + + for (int i : keys) + cache.put(i, new Value("str" + i, i * 100)); + + IgniteClosure<Cache.Entry<Integer, Value>, Integer> transformer = + new IgniteClosure<Cache.Entry<Integer, Value>, Integer>() { + @Override public Integer apply(Cache.Entry<Integer, Value> e) { + return e.getValue().idx; + } + }; + + List<Integer> res = cache.query(new ScanQuery<Integer, Value>().setPartition(0), transformer).getAll(); + + assertEquals(50, res.size()); + + Collections.sort(res); + + for (int i = 0; i < keys.length; i++) + assertEquals(keys[i] * 100, res.get(i).intValue()); + } + finally { + cache.destroy(); + } + } + + /** + * @throws Exception If failed. + */ public void testGetObjectFieldFiltered() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache");
