http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java deleted file mode 100644 index cd65681..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java +++ /dev/null @@ -1,895 +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.processors.cache.portable; - -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import javax.cache.Cache; -import javax.cache.CacheException; -import javax.cache.event.CacheEntryEvent; -import javax.cache.event.CacheEntryListenerException; -import javax.cache.event.CacheEntryUpdatedListener; -import javax.cache.event.EventType; -import javax.cache.processor.EntryProcessor; -import javax.cache.processor.MutableEntry; -import org.apache.ignite.IgniteBinary; -import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.IgniteException; -import org.apache.ignite.binary.BinaryObject; -import org.apache.ignite.binary.BinaryObjectBuilder; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.cache.CacheEntryEventSerializableFilter; -import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; -import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; -import org.apache.ignite.internal.portable.BinaryEnumObjectImpl; -import org.apache.ignite.internal.portable.BinaryMarshaller; -import org.apache.ignite.internal.portable.BinaryMetadata; -import org.apache.ignite.internal.portable.BinaryMetadataHandler; -import org.apache.ignite.internal.portable.BinaryObjectEx; -import org.apache.ignite.internal.portable.BinaryObjectImpl; -import org.apache.ignite.internal.portable.BinaryObjectOffheapImpl; -import org.apache.ignite.internal.portable.BinaryTypeImpl; -import org.apache.ignite.internal.portable.GridPortableMarshaller; -import org.apache.ignite.internal.portable.PortableContext; -import org.apache.ignite.internal.portable.PortableUtils; -import org.apache.ignite.internal.portable.builder.BinaryObjectBuilderImpl; -import org.apache.ignite.internal.portable.streams.PortableInputStream; -import org.apache.ignite.internal.portable.streams.PortableOffheapInputStream; -import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicate; -import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter; -import org.apache.ignite.internal.processors.cache.CacheObject; -import org.apache.ignite.internal.processors.cache.CacheObjectContext; -import org.apache.ignite.internal.processors.cache.CacheObjectImpl; -import org.apache.ignite.internal.processors.cache.GridCacheContext; -import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; -import org.apache.ignite.internal.processors.cache.GridCacheUtils; -import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; -import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.query.CacheQuery; -import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture; -import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; -import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl; -import org.apache.ignite.internal.util.GridUnsafe; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.internal.util.lang.GridMapEntry; -import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.internal.util.typedef.C1; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.internal.util.typedef.internal.CU; -import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteBiPredicate; -import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.lang.IgniteClosure; -import org.apache.ignite.marshaller.Marshaller; -import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; -import sun.misc.Unsafe; - -/** - * Portable processor implementation. - */ -public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorImpl implements - CacheObjectBinaryProcessor { - /** */ - private static final Unsafe UNSAFE = GridUnsafe.unsafe(); - - /** */ - private final CountDownLatch startLatch = new CountDownLatch(1); - - /** */ - private final boolean clientNode; - - /** */ - private volatile IgniteCacheProxy<PortableMetadataKey, BinaryMetadata> metaDataCache; - - /** */ - private final ConcurrentHashMap8<Integer, BinaryTypeImpl> clientMetaDataCache; - - /** Predicate to filter portable meta data in utility cache. */ - private final CacheEntryPredicate metaPred = new CacheEntryPredicateAdapter() { - private static final long serialVersionUID = 0L; - - @Override public boolean apply(GridCacheEntryEx e) { - return e.key().value(e.context().cacheObjectContext(), false) instanceof PortableMetadataKey; - } - }; - - /** */ - private PortableContext portableCtx; - - /** */ - private Marshaller marsh; - - /** */ - private GridPortableMarshaller portableMarsh; - - /** */ - @GridToStringExclude - private IgniteBinary portables; - - /** Metadata updates collected before metadata cache is initialized. */ - private final Map<Integer, BinaryMetadata> metaBuf = new ConcurrentHashMap<>(); - - /** */ - private UUID metaCacheQryId; - - /** - * @param ctx Kernal context. - */ - public CacheObjectBinaryProcessorImpl(GridKernalContext ctx) { - super(ctx); - - marsh = ctx.grid().configuration().getMarshaller(); - - clientNode = this.ctx.clientNode(); - - clientMetaDataCache = clientNode ? new ConcurrentHashMap8<Integer, BinaryTypeImpl>() : null; - } - - /** {@inheritDoc} */ - @Override public void start() throws IgniteCheckedException { - if (marsh instanceof BinaryMarshaller) { - BinaryMetadataHandler metaHnd = new BinaryMetadataHandler() { - @Override public void addMeta(int typeId, BinaryType newMeta) throws BinaryObjectException { - assert newMeta != null; - assert newMeta instanceof BinaryTypeImpl; - - BinaryMetadata newMeta0 = ((BinaryTypeImpl)newMeta).metadata(); - - if (metaDataCache == null) { - BinaryMetadata oldMeta = metaBuf.get(typeId); - BinaryMetadata mergedMeta = PortableUtils.mergeMetadata(oldMeta, newMeta0); - - if (oldMeta != mergedMeta) { - synchronized (this) { - mergedMeta = PortableUtils.mergeMetadata(oldMeta, newMeta0); - - if (oldMeta != mergedMeta) - metaBuf.put(typeId, mergedMeta); - else - return; - } - - if (metaDataCache == null) - return; - else - metaBuf.remove(typeId); - } - else - return; - } - - assert metaDataCache != null; - - CacheObjectBinaryProcessorImpl.this.addMeta(typeId, newMeta0.wrap(portableCtx)); - } - - @Override public BinaryType metadata(int typeId) throws BinaryObjectException { - if (metaDataCache == null) - U.awaitQuiet(startLatch); - - return CacheObjectBinaryProcessorImpl.this.metadata(typeId); - } - }; - - BinaryMarshaller pMarh0 = (BinaryMarshaller)marsh; - - portableCtx = new PortableContext(metaHnd, ctx.config()); - - IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setPortableContext", portableCtx, - ctx.config()); - - portableMarsh = new GridPortableMarshaller(portableCtx); - - portables = new IgniteBinaryImpl(ctx, this); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public void onUtilityCacheStarted() throws IgniteCheckedException { - IgniteCacheProxy<Object, Object> proxy = ctx.cache().jcache(CU.UTILITY_CACHE_NAME); - - boolean old = proxy.context().deploy().ignoreOwnership(true); - - try { - metaDataCache = (IgniteCacheProxy)proxy.withNoRetries(); - } - finally { - proxy.context().deploy().ignoreOwnership(old); - } - - if (clientNode) { - assert !metaDataCache.context().affinityNode(); - - metaCacheQryId = metaDataCache.context().continuousQueries().executeInternalQuery( - new MetaDataEntryListener(), - new MetaDataEntryFilter(), - false, - true); - - while (true) { - ClusterNode oldestSrvNode = - CU.oldestAliveCacheServerNode(ctx.cache().context(), AffinityTopologyVersion.NONE); - - if (oldestSrvNode == null) - break; - - GridCacheQueryManager qryMgr = metaDataCache.context().queries(); - - CacheQuery<Map.Entry<PortableMetadataKey, BinaryMetadata>> qry = - qryMgr.createScanQuery(new MetaDataPredicate(), null, false); - - qry.keepAll(false); - - qry.projection(ctx.cluster().get().forNode(oldestSrvNode)); - - try { - CacheQueryFuture<Map.Entry<PortableMetadataKey, BinaryMetadata>> fut = qry.execute(); - - Map.Entry<PortableMetadataKey, BinaryMetadata> next; - - while ((next = fut.next()) != null) { - assert next.getKey() != null : next; - assert next.getValue() != null : next; - - addClientCacheMetaData(next.getKey(), next.getValue()); - } - } - catch (IgniteCheckedException e) { - if (!ctx.discovery().alive(oldestSrvNode) || !ctx.discovery().pingNode(oldestSrvNode.id())) - continue; - else - throw e; - } - catch (CacheException e) { - if (X.hasCause(e, ClusterTopologyCheckedException.class, ClusterTopologyException.class)) - continue; - else - throw e; - } - - break; - } - } - - for (Map.Entry<Integer, BinaryMetadata> e : metaBuf.entrySet()) - addMeta(e.getKey(), e.getValue().wrap(portableCtx)); - - metaBuf.clear(); - - startLatch.countDown(); - } - - /** {@inheritDoc} */ - @Override public void onKernalStop(boolean cancel) { - super.onKernalStop(cancel); - - if (metaCacheQryId != null) - metaDataCache.context().continuousQueries().cancelInternalQuery(metaCacheQryId); - } - - /** - * @param key Metadata key. - * @param newMeta Metadata. - */ - private void addClientCacheMetaData(PortableMetadataKey key, final BinaryMetadata newMeta) { - int key0 = key.typeId(); - - clientMetaDataCache.compute(key0, new ConcurrentHashMap8.BiFun<Integer, BinaryTypeImpl, BinaryTypeImpl>() { - @Override public BinaryTypeImpl apply(Integer key, BinaryTypeImpl oldMeta) { - BinaryMetadata res; - - BinaryMetadata oldMeta0 = oldMeta != null ? oldMeta.metadata() : null; - - try { - res = PortableUtils.mergeMetadata(oldMeta0, newMeta); - } - catch (BinaryObjectException e) { - res = oldMeta0; - } - - return res != null ? res.wrap(portableCtx) : null; - } - }); - } - - /** {@inheritDoc} */ - @Override public int typeId(String typeName) { - if (portableCtx == null) - return super.typeId(typeName); - - return portableCtx.typeId(typeName); - } - - /** - * @param obj Object. - * @return Bytes. - * @throws org.apache.ignite.binary.BinaryObjectException If failed. - */ - public byte[] marshal(@Nullable Object obj) throws BinaryObjectException { - byte[] arr = portableMarsh.marshal(obj); - - assert arr.length > 0; - - return arr; - } - - /** - * @param ptr Off-heap pointer. - * @param forceHeap If {@code true} creates heap-based object. - * @return Object. - * @throws org.apache.ignite.binary.BinaryObjectException If failed. - */ - public Object unmarshal(long ptr, boolean forceHeap) throws BinaryObjectException { - assert ptr > 0 : ptr; - - int size = UNSAFE.getInt(ptr); - - ptr += 4; - - byte type = UNSAFE.getByte(ptr++); - - if (type != CacheObject.TYPE_BYTE_ARR) { - assert size > 0 : size; - - PortableInputStream in = new PortableOffheapInputStream(ptr, size, forceHeap); - - return portableMarsh.unmarshal(in); - } - else - return U.copyMemory(ptr, size); - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public Object marshalToPortable(@Nullable Object obj) throws BinaryObjectException { - if (obj == null) - return null; - - if (PortableUtils.isPortableType(obj.getClass())) - return obj; - - if (obj instanceof Object[]) { - Object[] arr = (Object[])obj; - - Object[] pArr = new Object[arr.length]; - - for (int i = 0; i < arr.length; i++) - pArr[i] = marshalToPortable(arr[i]); - - return pArr; - } - - if (obj instanceof IgniteBiTuple) { - IgniteBiTuple tup = (IgniteBiTuple)obj; - - if (obj instanceof T2) - return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); - - return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); - } - - if (obj instanceof Collection) { - Collection<Object> col = (Collection<Object>)obj; - - Collection<Object> pCol; - - if (col instanceof Set) - pCol = (Collection<Object>)PortableUtils.newSet((Set<?>)col); - else - pCol = new ArrayList<>(col.size()); - - for (Object item : col) - pCol.add(marshalToPortable(item)); - - return pCol; - } - - if (obj instanceof Map) { - Map<?, ?> map = (Map<?, ?>)obj; - - Map<Object, Object> pMap = PortableUtils.newMap((Map<Object, Object>)obj); - - for (Map.Entry<?, ?> e : map.entrySet()) - pMap.put(marshalToPortable(e.getKey()), marshalToPortable(e.getValue())); - - return pMap; - } - - if (obj instanceof Map.Entry) { - Map.Entry<?, ?> e = (Map.Entry<?, ?>)obj; - - return new GridMapEntry<>(marshalToPortable(e.getKey()), marshalToPortable(e.getValue())); - } - - byte[] arr = portableMarsh.marshal(obj); - - assert arr.length > 0; - - Object obj0 = portableMarsh.unmarshal(arr, null); - - // Possible if a class has writeObject method. - if (obj0 instanceof BinaryObject) - ((BinaryObjectImpl)obj0).detachAllowed(true); - - return obj0; - } - - /** - * @return Marshaller. - */ - public GridPortableMarshaller marshaller() { - return portableMarsh; - } - - /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(String clsName) { - return new BinaryObjectBuilderImpl(portableCtx, clsName); - } - - /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(BinaryObject portableObj) { - return BinaryObjectBuilderImpl.wrap(portableObj); - } - - /** {@inheritDoc} */ - @Override public void updateMetadata(int typeId, String typeName, @Nullable String affKeyFieldName, - Map<String, Integer> fieldTypeIds, boolean isEnum) throws BinaryObjectException { - BinaryMetadata meta = new BinaryMetadata(typeId, typeName, fieldTypeIds, affKeyFieldName, null, isEnum); - - portableCtx.updateMetadata(typeId, meta); - } - - /** {@inheritDoc} */ - @Override public void addMeta(final int typeId, final BinaryType newMeta) throws BinaryObjectException { - assert newMeta != null; - assert newMeta instanceof BinaryTypeImpl; - - BinaryMetadata newMeta0 = ((BinaryTypeImpl)newMeta).metadata(); - - final PortableMetadataKey key = new PortableMetadataKey(typeId); - - try { - BinaryMetadata oldMeta = metaDataCache.localPeek(key); - BinaryMetadata mergedMeta = PortableUtils.mergeMetadata(oldMeta, newMeta0); - - BinaryObjectException err = metaDataCache.invoke(key, new MetadataProcessor(mergedMeta)); - - if (err != null) - throw err; - } - catch (CacheException e) { - throw new BinaryObjectException("Failed to update meta data for type: " + newMeta.typeName(), e); - } - } - - /** {@inheritDoc} */ - @Nullable @Override public BinaryType metadata(final int typeId) throws BinaryObjectException { - try { - if (clientNode) - return clientMetaDataCache.get(typeId); - else { - PortableMetadataKey key = new PortableMetadataKey(typeId); - - BinaryMetadata meta = metaDataCache.localPeek(key); - - if (meta == null && !metaDataCache.context().preloader().syncFuture().isDone()) - meta = metaDataCache.getTopologySafe(key); - - return meta != null ? meta.wrap(portableCtx) : null; - } - } - catch (CacheException e) { - throw new BinaryObjectException(e); - } - } - - /** {@inheritDoc} */ - @Override public Map<Integer, BinaryType> metadata(Collection<Integer> typeIds) - throws BinaryObjectException { - try { - Collection<PortableMetadataKey> keys = new ArrayList<>(typeIds.size()); - - for (Integer typeId : typeIds) - keys.add(new PortableMetadataKey(typeId)); - - Map<PortableMetadataKey, BinaryMetadata> meta = metaDataCache.getAll(keys); - - Map<Integer, BinaryType> res = U.newHashMap(meta.size()); - - for (Map.Entry<PortableMetadataKey, BinaryMetadata> e : meta.entrySet()) - res.put(e.getKey().typeId(), e.getValue().wrap(portableCtx)); - - return res; - } - catch (CacheException e) { - throw new BinaryObjectException(e); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public Collection<BinaryType> metadata() throws BinaryObjectException { - if (clientNode) - return F.viewReadOnly(clientMetaDataCache.values(), new IgniteClosure<BinaryTypeImpl, BinaryType>() { - @Override public BinaryType apply(BinaryTypeImpl meta) { - return meta; - } - }); - else { - return F.viewReadOnly(metaDataCache.entrySetx(metaPred), - new C1<Cache.Entry<PortableMetadataKey, BinaryMetadata>, BinaryType>() { - private static final long serialVersionUID = 0L; - - @Override public BinaryType apply(Cache.Entry<PortableMetadataKey, BinaryMetadata> e) { - return e.getValue().wrap(portableCtx); - } - }); - } - } - - /** {@inheritDoc} */ - @Override public BinaryObject buildEnum(String typeName, int ord) throws IgniteException { - typeName = PortableContext.typeName(typeName); - - int typeId = portableCtx.typeId(typeName); - - updateMetadata(typeId, typeName, null, null, true); - - return new BinaryEnumObjectImpl(portableCtx, typeId, null, ord); - } - - /** {@inheritDoc} */ - @Override public IgniteBinary binary() throws IgniteException { - return portables; - } - - /** {@inheritDoc} */ - @Override public boolean isPortableObject(Object obj) { - return obj instanceof BinaryObject; - } - - /** {@inheritDoc} */ - @Override public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg) { - return marsh instanceof BinaryMarshaller; - } - - /** - * @param po Portable object. - * @return Affinity key. - */ - public Object affinityKey(BinaryObject po) { - try { - BinaryType meta = po.type(); - - if (meta != null) { - String affKeyFieldName = meta.affinityKeyFieldName(); - - if (affKeyFieldName != null) - return po.field(affKeyFieldName); - } - else if (po instanceof BinaryObjectEx) { - int id = ((BinaryObjectEx)po).typeId(); - - String affKeyFieldName = portableCtx.affinityKeyFieldName(id); - - if (affKeyFieldName != null) - return po.field(affKeyFieldName); - } - } - catch (BinaryObjectException e) { - U.error(log, "Failed to get affinity field from portable object: " + po, e); - } - - return po; - } - - /** {@inheritDoc} */ - @Override public int typeId(Object obj) { - if (obj == null) - return 0; - - return isPortableObject(obj) ? ((BinaryObjectEx)obj).typeId() : typeId(obj.getClass().getSimpleName()); - } - - /** {@inheritDoc} */ - @Override public Object field(Object obj, String fieldName) { - if (obj == null) - return null; - - return isPortableObject(obj) ? ((BinaryObject)obj).field(fieldName) : super.field(obj, fieldName); - } - - /** {@inheritDoc} */ - @Override public boolean hasField(Object obj, String fieldName) { - return obj != null && ((BinaryObject)obj).hasField(fieldName); - } - - /** - * @return Portable context. - */ - public PortableContext portableContext() { - return portableCtx; - } - - /** {@inheritDoc} */ - @Override public CacheObjectContext contextForCache(CacheConfiguration cfg) throws IgniteCheckedException { - assert cfg != null; - - boolean portableEnabled = marsh instanceof BinaryMarshaller && !GridCacheUtils.isSystemCache(cfg.getName()) && - !GridCacheUtils.isIgfsCache(ctx.config(), cfg.getName()); - - CacheObjectContext ctx0 = super.contextForCache(cfg); - - CacheObjectContext res = new CacheObjectPortableContext(ctx, - ctx0.copyOnGet(), - ctx0.storeValue(), - portableEnabled, - ctx0.addDeploymentInfo()); - - ctx.resource().injectGeneric(res.defaultAffMapper()); - - return res; - } - - /** {@inheritDoc} */ - @Override public byte[] marshal(CacheObjectContext ctx, Object val) throws IgniteCheckedException { - if (!((CacheObjectPortableContext)ctx).portableEnabled() || portableMarsh == null) - return super.marshal(ctx, val); - - byte[] arr = portableMarsh.marshal(val); - - assert arr.length > 0; - - return arr; - } - - /** {@inheritDoc} */ - @Override public Object unmarshal(CacheObjectContext ctx, byte[] bytes, ClassLoader clsLdr) - throws IgniteCheckedException { - if (!((CacheObjectPortableContext)ctx).portableEnabled() || portableMarsh == null) - return super.unmarshal(ctx, bytes, clsLdr); - - return portableMarsh.unmarshal(bytes, clsLdr); - } - - /** {@inheritDoc} */ - @Override public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, Object obj, boolean userObj) { - if (!((CacheObjectPortableContext)ctx).portableEnabled()) - return super.toCacheKeyObject(ctx, obj, userObj); - - if (obj instanceof KeyCacheObject) - return (KeyCacheObject)obj; - - if (((CacheObjectPortableContext)ctx).portableEnabled()) { - obj = toPortable(obj); - - if (obj instanceof BinaryObject) - return (BinaryObjectImpl)obj; - } - - return toCacheKeyObject0(obj, userObj); - } - - /** {@inheritDoc} */ - @Nullable @Override public CacheObject toCacheObject(CacheObjectContext ctx, @Nullable Object obj, - boolean userObj) { - if (!((CacheObjectPortableContext)ctx).portableEnabled()) - return super.toCacheObject(ctx, obj, userObj); - - if (obj == null || obj instanceof CacheObject) - return (CacheObject)obj; - - obj = toPortable(obj); - - if (obj instanceof BinaryObject) - return (BinaryObjectImpl)obj; - - return toCacheObject0(obj, userObj); - } - - /** {@inheritDoc} */ - @Override public CacheObject toCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) { - if (type == BinaryObjectImpl.TYPE_BINARY) - return new BinaryObjectImpl(portableContext(), bytes, 0); - - return super.toCacheObject(ctx, type, bytes); - } - - /** {@inheritDoc} */ - @Override public CacheObject toCacheObject(GridCacheContext ctx, long valPtr, boolean tmp) - throws IgniteCheckedException { - if (!((CacheObjectPortableContext)ctx.cacheObjectContext()).portableEnabled()) - return super.toCacheObject(ctx, valPtr, tmp); - - Object val = unmarshal(valPtr, !tmp); - - if (val instanceof BinaryObjectOffheapImpl) - return (BinaryObjectOffheapImpl)val; - - return new CacheObjectImpl(val, null); - } - - /** {@inheritDoc} */ - @Override public Object unwrapTemporary(GridCacheContext ctx, Object obj) throws BinaryObjectException { - if (!((CacheObjectPortableContext)ctx.cacheObjectContext()).portableEnabled()) - return obj; - - if (obj instanceof BinaryObjectOffheapImpl) - return ((BinaryObjectOffheapImpl)obj).heapCopy(); - - return obj; - } - - /** - * @param obj Object. - * @return Portable object. - * @throws IgniteException In case of error. - */ - @Nullable public Object toPortable(@Nullable Object obj) throws IgniteException { - if (obj == null) - return null; - - if (isPortableObject(obj)) - return obj; - - return marshalToPortable(obj); - } - - /** - * Processor responsible for metadata update. - */ - private static class MetadataProcessor - implements EntryProcessor<PortableMetadataKey, BinaryMetadata, BinaryObjectException>, Externalizable { - /** */ - private static final long serialVersionUID = 0L; - - /** */ - private BinaryMetadata newMeta; - - /** - * For {@link Externalizable}. - */ - public MetadataProcessor() { - // No-op. - } - - /** - * @param newMeta New metadata. - */ - private MetadataProcessor(BinaryMetadata newMeta) { - assert newMeta != null; - - this.newMeta = newMeta; - } - - /** {@inheritDoc} */ - @Override public BinaryObjectException process(MutableEntry<PortableMetadataKey, BinaryMetadata> entry, - Object... args) { - try { - BinaryMetadata oldMeta = entry.getValue(); - - BinaryMetadata mergedMeta = PortableUtils.mergeMetadata(oldMeta, newMeta); - - if (mergedMeta != oldMeta) - entry.setValue(mergedMeta); - - return null; - } - catch (BinaryObjectException e) { - return e; - } - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(newMeta); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - newMeta = (BinaryMetadata)in.readObject(); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(MetadataProcessor.class, this); - } - } - - /** - * - */ - class MetaDataEntryListener implements CacheEntryUpdatedListener<PortableMetadataKey, BinaryMetadata> { - /** {@inheritDoc} */ - @Override public void onUpdated( - Iterable<CacheEntryEvent<? extends PortableMetadataKey, ? extends BinaryMetadata>> evts) - throws CacheEntryListenerException { - for (CacheEntryEvent<? extends PortableMetadataKey, ? extends BinaryMetadata> evt : evts) { - assert evt.getEventType() == EventType.CREATED || evt.getEventType() == EventType.UPDATED : evt; - - PortableMetadataKey key = evt.getKey(); - - final BinaryMetadata newMeta = evt.getValue(); - - assert newMeta != null : evt; - - addClientCacheMetaData(key, newMeta); - } - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(MetaDataEntryListener.class, this); - } - } - - /** - * - */ - static class MetaDataEntryFilter implements CacheEntryEventSerializableFilter<Object, Object> { - /** */ - private static final long serialVersionUID = 0L; - - /** {@inheritDoc} */ - @Override public boolean evaluate(CacheEntryEvent<?, ?> evt) throws CacheEntryListenerException { - return evt.getKey() instanceof PortableMetadataKey; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(MetaDataEntryFilter.class, this); - } - } - - /** - * - */ - static class MetaDataPredicate implements IgniteBiPredicate<Object, Object> { - /** */ - private static final long serialVersionUID = 0L; - - /** {@inheritDoc} */ - @Override public boolean apply(Object key, Object val) { - return key instanceof PortableMetadataKey; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(MetaDataPredicate.class, this); - } - } -}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java deleted file mode 100644 index 719d0a9..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableContext.java +++ /dev/null @@ -1,56 +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.processors.cache.portable; - -import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper; -import org.apache.ignite.internal.processors.cache.CacheObjectContext; -import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper; - -/** - * - */ -public class CacheObjectPortableContext extends CacheObjectContext { - /** */ - private boolean portableEnabled; - - /** - * @param kernalCtx Kernal context. - * @param portableEnabled Portable enabled flag. - * @param cpyOnGet Copy on get flag. - * @param storeVal {@code True} if should store unmarshalled value in cache. - * @param depEnabled {@code true} if deployment is enabled for the given cache. - */ - public CacheObjectPortableContext(GridKernalContext kernalCtx, - boolean cpyOnGet, - boolean storeVal, - boolean portableEnabled, - boolean depEnabled) { - super(kernalCtx, portableEnabled ? new CacheDefaultBinaryAffinityKeyMapper() : - new GridCacheDefaultAffinityKeyMapper(), cpyOnGet, storeVal, depEnabled); - - this.portableEnabled = portableEnabled; - } - - /** - * @return Portable enabled flag. - */ - public boolean portableEnabled() { - return portableEnabled; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgniteBinaryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgniteBinaryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgniteBinaryImpl.java deleted file mode 100644 index 7008502..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/IgniteBinaryImpl.java +++ /dev/null @@ -1,178 +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.processors.cache.portable; - -import java.util.Collection; -import org.apache.ignite.IgniteBinary; -import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; -import org.apache.ignite.binary.BinaryObjectBuilder; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.binary.BinaryObject; -import org.jetbrains.annotations.Nullable; - -/** - * {@link org.apache.ignite.IgniteBinary} implementation. - */ -public class IgniteBinaryImpl implements IgniteBinary { - /** */ - private GridKernalContext ctx; - - /** */ - private CacheObjectBinaryProcessor proc; - - /** - * @param ctx Context. - */ - public IgniteBinaryImpl(GridKernalContext ctx, CacheObjectBinaryProcessor proc) { - this.ctx = ctx; - - this.proc = proc; - } - - /** {@inheritDoc} */ - @Override public int typeId(String typeName) { - guard(); - - try { - return proc.typeId(typeName); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public <T> T toBinary(@Nullable Object obj) throws BinaryObjectException { - guard(); - - try { - return (T)proc.marshalToPortable(obj); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(String typeName) { - guard(); - - try { - return proc.builder(typeName); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(BinaryObject portableObj) { - guard(); - - try { - return proc.builder(portableObj); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Nullable @Override public BinaryType type(Class<?> cls) throws BinaryObjectException { - guard(); - - try { - return proc.metadata(proc.typeId(cls.getName())); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Nullable @Override public BinaryType type(String typeName) throws BinaryObjectException { - guard(); - - try { - return proc.metadata(proc.typeId(typeName)); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Nullable @Override public BinaryType type(int typeId) throws BinaryObjectException { - guard(); - - try { - return proc.metadata(typeId); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Override public Collection<BinaryType> types() throws BinaryObjectException { - guard(); - - try { - return proc.metadata(); - } - finally { - unguard(); - } - } - - /** {@inheritDoc} */ - @Override public BinaryObject buildEnum(String typeName, int ord) { - guard(); - - try { - return proc.buildEnum(typeName, ord); - } - finally { - unguard(); - } - } - - /** - * @return Portable processor. - */ - public IgniteCacheObjectProcessor processor() { - return proc; - } - - /** - * <tt>ctx.gateway().readLock()</tt> - */ - private void guard() { - ctx.gateway().readLock(); - } - - /** - * <tt>ctx.gateway().readUnlock()</tt> - */ - private void unguard() { - ctx.gateway().readUnlock(); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetadataKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetadataKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetadataKey.java deleted file mode 100644 index f838c82..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/PortableMetadataKey.java +++ /dev/null @@ -1,82 +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.processors.cache.portable; - -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; -import org.apache.ignite.internal.util.typedef.internal.S; - -/** - * Key for portable meta data. - */ -class PortableMetadataKey extends GridCacheUtilityKey<PortableMetadataKey> implements Externalizable { - /** */ - private static final long serialVersionUID = 0L; - - /** */ - private int typeId; - - /** - * For {@link Externalizable}. - */ - public PortableMetadataKey() { - // No-op. - } - - /** - * @param typeId Type ID. - */ - PortableMetadataKey(int typeId) { - this.typeId = typeId; - } - - /** - * @return Type id. - */ - public int typeId() { - return typeId; - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeInt(typeId); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - typeId = in.readInt(); - } - - /** {@inheritDoc} */ - @Override protected boolean equalsx(PortableMetadataKey key) { - return typeId == key.typeId; - } - - /** {@inheritDoc} */ - @Override public int hashCode() { - return typeId; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(PortableMetadataKey.class, this); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/package-info.java deleted file mode 100644 index 6c30811..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/package-info.java +++ /dev/null @@ -1,22 +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 description. --> - * Implementation of portable processor. - */ -package org.apache.ignite.internal.processors.cache.portable; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java index 385b4b1..d001c76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStore; -import org.apache.ignite.internal.portable.BinaryMarshaller; +import org.apache.ignite.internal.binary.BinaryMarshaller; /** * Default store manager implementation. @@ -84,4 +84,4 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter { @Override public boolean configuredConvertPortable() { return !(ctx.config().getMarshaller() instanceof BinaryMarshaller && cfg.isKeepBinaryInStore()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java index 09cb29d..9c783aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.platform; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; import org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils; @@ -317,4 +317,4 @@ public abstract class PlatformAbstractTarget implements PlatformTarget { protected <T> T throwUnsupported(int type) throws IgniteCheckedException { throw new IgniteCheckedException("Unsupported operation type: " + type); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java index 12eb36e..b8f5912 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java @@ -21,8 +21,8 @@ import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.events.Event; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor; import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery; @@ -272,4 +272,4 @@ public interface PlatformContext { * @return Cluster node filter. */ public PlatformClusterNodeFilter createClusterNodeFilter(Object filter); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java index 71f42e2..631f78c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java @@ -34,12 +34,12 @@ import org.apache.ignite.events.JobEvent; import org.apache.ignite.events.SwapSpaceEvent; import org.apache.ignite.events.TaskEvent; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; -import org.apache.ignite.internal.portable.BinaryReaderExImpl; -import org.apache.ignite.internal.portable.BinaryTypeImpl; -import org.apache.ignite.internal.portable.GridPortableMarshaller; -import org.apache.ignite.internal.processors.cache.portable.CacheObjectBinaryProcessorImpl; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryReaderExImpl; +import org.apache.ignite.internal.binary.BinaryTypeImpl; +import org.apache.ignite.internal.binary.GridPortableMarshaller; +import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilterImpl; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor; http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java index e8e7b9b..f537d5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformExtendedException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.platform; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; /** * Denotes an exception which has some data to be written in a special manner. @@ -54,4 +54,4 @@ public abstract class PlatformExtendedException extends PlatformException { * @param writer Writer. */ public abstract void writeData(BinaryRawWriterEx writer); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java index 27d7da3..a788775 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java @@ -26,7 +26,7 @@ import org.apache.ignite.configuration.PlatformConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteComputeImpl; import org.apache.ignite.internal.cluster.ClusterGroupAdapter; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl; @@ -371,4 +371,4 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf this.convertPortable = convertPortable; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java index 5943440..da7a15d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java @@ -28,8 +28,8 @@ import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cache.query.TextQuery; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.CacheOperationContext; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; @@ -1087,4 +1087,4 @@ public class PlatformCache extends PlatformAbstractTarget { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java index 6998451..d027a9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache; import org.apache.ignite.Ignite; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -103,4 +103,4 @@ public class PlatformCacheEntryFilterImpl extends PlatformAbstractPredicate impl ptr = ctx.gateway().cacheEntryFilterCreate(mem.pointer()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java index ce06ec1..3986a13 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java @@ -26,8 +26,8 @@ import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; @@ -217,4 +217,4 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { proc = in.readObject(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java index a5659af..292caea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.cache; import java.util.Iterator; import javax.cache.Cache; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -69,4 +69,4 @@ public class PlatformCacheIterator extends PlatformAbstractTarget { super.processOutStream(type, writer); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java index 8314e3a..8cb1490 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.platform.cache; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformExtendedException; @@ -56,4 +56,4 @@ public class PlatformCachePartialUpdateException extends PlatformExtendedExcepti PlatformUtils.writeNullableCollection(writer, keys); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java index c4e0350..acd2707 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java @@ -25,8 +25,8 @@ import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; @@ -294,4 +294,4 @@ public class PlatformAffinity extends PlatformAbstractTarget { public int partitions() { return aff.partitions(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java index 8c24d23..7422757 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import java.util.Iterator; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -189,4 +189,4 @@ public abstract class PlatformAbstractQueryCursor<T> extends PlatformAbstractTar cnt++; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java index 9f67118..759797c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import org.apache.ignite.Ignite; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; @@ -185,4 +185,4 @@ public class PlatformContinuousQueryRemoteFilter implements PlatformContinuousQu @Override public String toString() { return S.toString(PlatformContinuousQueryRemoteFilter.class, this); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java index 035e927..a4cdae6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import java.util.List; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -46,4 +46,4 @@ public class PlatformFieldsQueryCursor extends PlatformAbstractQueryCursor<List< for (Object val : vals) writer.writeObjectDetached(val); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java index fe94e65..39e0184 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import javax.cache.Cache; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -42,4 +42,4 @@ public class PlatformQueryCursor extends PlatformAbstractQueryCursor<Cache.Entry writer.writeObjectDetached(val.getKey()); writer.writeObjectDetached(val.getValue()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java index 45110ce..ad0d081 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.platform.cache.store; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -58,4 +58,4 @@ public abstract class PlatformCacheStoreCallback { * @param reader Reader. */ protected abstract void invoke0(BinaryRawReaderEx reader); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java index fc47a4b..f60766b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java @@ -24,8 +24,8 @@ import org.apache.ignite.IgniteCluster; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.cluster.ClusterGroupEx; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; @@ -332,4 +332,4 @@ public class PlatformClusterGroup extends PlatformAbstractTarget { return ((IgniteCluster)prj).topology(topVer); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java index 92aabd8..72e4a71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.cluster; import org.apache.ignite.Ignite; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -75,4 +75,4 @@ public class PlatformClusterNodeFilterImpl extends PlatformAbstractPredicate imp public void setIgniteInstance(Ignite ignite) { ctx = PlatformUtils.platformContext(ignite); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java index 462f2c4..32aed39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.compute; import java.io.Externalizable; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -153,4 +153,4 @@ public abstract class PlatformAbstractJob implements PlatformJob, Externalizable @Override public Object job() { return job; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java index c293c51..a8a51d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java @@ -24,7 +24,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeJobResultPolicy; import org.apache.ignite.compute.ComputeTask; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformNativeException; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -203,4 +203,4 @@ public abstract class PlatformAbstractTask implements ComputeTask<Object, Void> lock.readLock().unlock(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java index b35f31c..f8567ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -101,4 +101,4 @@ public class PlatformClosureJob extends PlatformAbstractJob { @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { job = in.readObject(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java index 05db49d..3cb65b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java @@ -25,9 +25,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteCompute; import org.apache.ignite.internal.IgniteComputeImpl; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.portable.BinaryObjectImpl; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryObjectImpl; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.util.typedef.C1; @@ -329,4 +329,4 @@ public class PlatformCompute extends PlatformAbstractTarget { return nodeIds == null ? compute : platformCtx.kernalContext().grid().compute(compute.clusterGroup().forNodeIds(nodeIds)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java index 9302c03..51c9cdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; @@ -217,4 +217,4 @@ public class PlatformFullJob extends PlatformAbstractJob { throw new IgniteCheckedException(reader.readString()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java index d789003..e2f6720 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java @@ -27,8 +27,8 @@ import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeTaskNoResultCache; import org.apache.ignite.internal.IgniteComputeImpl; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -189,4 +189,4 @@ public final class PlatformFullTask extends PlatformAbstractTask { else throw new IgniteException(reader.readString()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java index 4bd311b..3cfbcaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurat import org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.Marshaller; -import org.apache.ignite.internal.portable.BinaryMarshaller; +import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.platform.cpp.PlatformCppConfiguration; import java.util.Collections; @@ -111,4 +111,4 @@ public class PlatformCppConfigurationClosure extends PlatformAbstractConfigurati throw U.convertException(e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java index 794ab0b..82c3e59 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java @@ -24,14 +24,13 @@ import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.utils.PlatformFutureUtils; import org.apache.ignite.internal.util.lang.GridMapEntry; -import org.apache.ignite.internal.util.typedef.internal.U; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_JOINED; @@ -224,4 +223,4 @@ public class PlatformDataStreamer extends PlatformAbstractTarget { public void perNodeParallelOperations(int val) { ldr.perNodeParallelOperations(val); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/1dbf20e0/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java index 5915496..2a3848a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.datastreamer; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; -import org.apache.ignite.internal.portable.BinaryRawWriterEx; +import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.cache.PlatformCache; @@ -116,4 +116,4 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem keepPortable = in.readBoolean(); } -} \ No newline at end of file +}