ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpav...@apache.org
Subject ignite git commit: IGNITE-5823 Unused CacheAtomicUpdateTimeoutException was removed - Fixes #2364.
Date Wed, 06 Jun 2018 11:55:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 1adbc44d1 -> 7105e36d8


IGNITE-5823 Unused CacheAtomicUpdateTimeoutException was removed - Fixes #2364.

Signed-off-by: dpavlov <dpavlov@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7105e36d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7105e36d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7105e36d

Branch: refs/heads/master
Commit: 7105e36d836e9c581d032a8bee5167370bb9dd6d
Parents: 1adbc44
Author: StalkXT <stalk007star@gmail.com>
Authored: Wed Jun 6 14:54:17 2018 +0300
Committer: dpavlov <dpavlov@apache.org>
Committed: Wed Jun 6 14:54:17 2018 +0300

----------------------------------------------------------------------
 .../CacheAtomicUpdateTimeoutException.java      | 47 --------------
 ...acheAtomicUpdateTimeoutCheckedException.java | 47 --------------
 .../processors/cache/GridCacheUtils.java        |  3 -
 .../resources/META-INF/classnames.properties    |  2 -
 .../ignite/platform/PlatformExceptionTask.java  |  4 +-
 .../platforms/cpp/common/src/ignite_error.cpp   |  8 +--
 .../Apache.Ignite.Core.csproj                   |  3 +-
 .../Cache/CacheAtomicUpdateTimeoutException.cs  | 67 --------------------
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |  1 -
 9 files changed, 5 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
deleted file mode 100644
index a192bda..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicUpdateTimeoutException.java
+++ /dev/null
@@ -1,47 +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.cache;
-
-import javax.cache.CacheException;
-
-/**
- * Exception thrown when atomic operation timeout occurs.
- */
-public class CacheAtomicUpdateTimeoutException extends CacheException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new timeout exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public CacheAtomicUpdateTimeoutException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new timeout exception with given error message and optional nested exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be <tt>null</tt>).
-     */
-    public CacheAtomicUpdateTimeoutException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
deleted file mode 100644
index 4706996..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAtomicUpdateTimeoutCheckedException.java
+++ /dev/null
@@ -1,47 +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;
-
-import org.apache.ignite.IgniteCheckedException;
-
-/**
- * Exception thrown when atomic operation timeout occurs.
- */
-public class CacheAtomicUpdateTimeoutCheckedException extends IgniteCheckedException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new timeout exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public CacheAtomicUpdateTimeoutCheckedException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new timeout exception with given error message and optional nested exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be <tt>null</tt>).
-     */
-    public CacheAtomicUpdateTimeoutCheckedException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 6660c0b..fca01b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -46,7 +46,6 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.cache.CacheAtomicUpdateTimeoutException;
 import org.apache.ignite.cache.CachePartialUpdateException;
 import org.apache.ignite.cache.CacheServerNotFoundException;
 import org.apache.ignite.cache.QueryEntity;
@@ -1281,8 +1280,6 @@ public class GridCacheUtils {
 
         if (e instanceof CachePartialUpdateCheckedException)
             return new CachePartialUpdateException((CachePartialUpdateCheckedException)e);
-        else if (e instanceof CacheAtomicUpdateTimeoutCheckedException)
-            return new CacheAtomicUpdateTimeoutException(e.getMessage(), e);
         else if (e instanceof ClusterTopologyServerNotFoundException)
             return new CacheServerNotFoundException(e.getMessage(), e);
         else if (e instanceof SchemaOperationException)

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/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 f1aec97..a6f4e46 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -29,7 +29,6 @@ org.apache.ignite.binary.BinaryInvalidTypeException
 org.apache.ignite.binary.BinaryObject
 org.apache.ignite.binary.BinaryObjectException
 org.apache.ignite.binary.BinaryTypeConfiguration
-org.apache.ignite.cache.CacheAtomicUpdateTimeoutException
 org.apache.ignite.cache.CacheAtomicityMode
 org.apache.ignite.cache.CacheEntryEventSerializableFilter
 org.apache.ignite.cache.CacheEntryProcessor
@@ -428,7 +427,6 @@ org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$5
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$7
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$8
 org.apache.ignite.internal.processors.cache.CacheAffinitySharedManager$9
-org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException
 org.apache.ignite.internal.processors.cache.CacheClientReconnectDiscoveryData
 org.apache.ignite.internal.processors.cache.CacheClientReconnectDiscoveryData$CacheGroupInfo
 org.apache.ignite.internal.processors.cache.CacheClientReconnectDiscoveryData$CacheInfo

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/core/src/test/java/org/apache/ignite/platform/PlatformExceptionTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformExceptionTask.java
b/modules/core/src/test/java/org/apache/ignite/platform/PlatformExceptionTask.java
index 0962fc5..aea3433 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformExceptionTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformExceptionTask.java
@@ -19,7 +19,6 @@ package org.apache.ignite.platform;
 
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.cache.CacheAtomicUpdateTimeoutException;
 import org.apache.ignite.cluster.ClusterGroupEmptyException;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.cluster.ClusterTopologyException;
@@ -65,7 +64,6 @@ public class PlatformExceptionTask extends ComputeTaskAdapter<String,
String> {
             case "CacheLoaderException": throw new CacheLoaderException(arg);
             case "CacheWriterException": throw new CacheWriterException(arg);
             case "EntryProcessorException": throw new EntryProcessorException(arg);
-            case "CacheAtomicUpdateTimeoutException": throw new CacheAtomicUpdateTimeoutException(arg);
             case "TransactionOptimisticException": throw new TransactionOptimisticException(arg);
             case "TransactionTimeoutException": throw new TransactionTimeoutException(arg);
             case "TransactionRollbackException": throw new TransactionRollbackException(arg);
@@ -83,4 +81,4 @@ public class PlatformExceptionTask extends ComputeTaskAdapter<String,
String> {
     @Nullable @Override public String reduce(List<ComputeJobResult> results) {
         return results.get(0).getData();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/platforms/cpp/common/src/ignite_error.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/src/ignite_error.cpp b/modules/platforms/cpp/common/src/ignite_error.cpp
index d20eda8..e55a6a7 100644
--- a/modules/platforms/cpp/common/src/ignite_error.cpp
+++ b/modules/platforms/cpp/common/src/ignite_error.cpp
@@ -108,7 +108,7 @@ namespace ignite
 
                 if (jniCls0.compare("java.lang.NoClassDefFoundError") == 0)
                 {
-                    std::stringstream stream; 
+                    std::stringstream stream;
 
                     stream << "Java class is not found (did you set IGNITE_HOME environment
variable?)";
 
@@ -158,8 +158,6 @@ namespace ignite
                     err = IgniteError(IGNITE_ERR_CACHE_WRITER, jniMsg);
                 else if (jniCls0.compare("javax.cache.processor.EntryProcessorException")
== 0)
                     err = IgniteError(IGNITE_ERR_ENTRY_PROCESSOR, jniMsg);
-                else if (jniCls0.compare("org.apache.ignite.cache.CacheAtomicUpdateTimeoutException")
== 0)
-                    err = IgniteError(IGNITE_ERR_CACHE_ATOMIC_UPDATE_TIMEOUT, jniMsg);
                 else if (jniCls0.compare("org.apache.ignite.cache.CachePartialUpdateException")
== 0)
                     err = IgniteError(IGNITE_ERR_CACHE_PARTIAL_UPDATE, jniMsg);
                 else if (jniCls0.compare("org.apache.ignite.transactions.TransactionOptimisticException")
== 0)
@@ -181,7 +179,7 @@ namespace ignite
                 else
                 {
                     std::stringstream stream;
-                    
+
                     stream << "Java exception occurred [cls=" << jniCls0;
 
                     if (jniMsg)
@@ -190,7 +188,7 @@ namespace ignite
                     stream << "]";
 
                     err = IgniteError(IGNITE_ERR_UNKNOWN, stream.str().c_str());
-                }                    
+                }
             }
             else
             {

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 9ae3a26..273e088 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -179,7 +179,6 @@
     <Compile Include="Cache\Affinity\Package-Info.cs" />
     <Compile Include="Cache\Affinity\Rendezvous\Package-Info.cs" />
     <Compile Include="Cache\Affinity\Rendezvous\RendezvousAffinityFunction.cs" />
-    <Compile Include="Cache\CacheAtomicUpdateTimeoutException.cs" />
     <Compile Include="Cache\CacheEntryProcessorException.cs" />
     <Compile Include="Cache\CacheException.cs" />
     <Compile Include="Cache\CachePartialUpdateException.cs" />
@@ -598,4 +597,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheAtomicUpdateTimeoutException.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheAtomicUpdateTimeoutException.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheAtomicUpdateTimeoutException.cs
deleted file mode 100644
index f0b5987..0000000
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/CacheAtomicUpdateTimeoutException.cs
+++ /dev/null
@@ -1,67 +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.
- */
-
-namespace Apache.Ignite.Core.Cache
-{
-    using System;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// Indicates atomic operation timeout.
-    /// </summary>
-    [Serializable]
-    public class CacheAtomicUpdateTimeoutException : CacheException
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheAtomicUpdateTimeoutException"/>
class.
-        /// </summary>
-        public CacheAtomicUpdateTimeoutException()
-        {
-            // No-op.
-        }
-
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheAtomicUpdateTimeoutException"/>
class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public CacheAtomicUpdateTimeoutException(string message) : base(message)
-        {
-            // No-op.
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheAtomicUpdateTimeoutException"/>
class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="cause">The cause.</param>
-        public CacheAtomicUpdateTimeoutException(string message, Exception cause) : base(message,
cause)
-        {
-            // No-op.
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheAtomicUpdateTimeoutException"/>
class.
-        /// </summary>
-        /// <param name="info">Serialization information.</param>
-        /// <param name="ctx">Streaming context.</param>
-        protected CacheAtomicUpdateTimeoutException(SerializationInfo info, StreamingContext
ctx) : base(info, ctx)
-        {
-            // No-op.
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/7105e36d/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
index 0dab997..6d4aea4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/ExceptionUtils.cs
@@ -91,7 +91,6 @@ namespace Apache.Ignite.Core.Impl
             Exs["javax.cache.integration.CacheLoaderException"] = (c, m, e, i) => new
CacheStoreException(m, e);
             Exs["javax.cache.integration.CacheWriterException"] = (c, m, e, i) => new
CacheStoreException(m, e);
             Exs["javax.cache.processor.EntryProcessorException"] = (c, m, e, i) => new
CacheEntryProcessorException(m, e);
-            Exs["org.apache.ignite.cache.CacheAtomicUpdateTimeoutException"] = (c, m, e,
i) => new CacheAtomicUpdateTimeoutException(m, e);
 
             // Transaction exceptions.
             Exs["org.apache.ignite.transactions.TransactionOptimisticException"] = (c, m,
e, i) => new TransactionOptimisticException(m, e);


Mime
View raw message