You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/05/24 17:27:08 UTC
[24/41] ignite git commit: ignite-gg-12163 backport of GG-12184
ignite-gg-12163 backport of GG-12184
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1c825f0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1c825f0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1c825f0
Branch: refs/heads/ignite-5267
Commit: e1c825f034f4951c647aea9293f18bd0953b44e3
Parents: f8792ed
Author: Ivan Rakov <iv...@gmail.com>
Authored: Tue May 23 18:25:04 2017 +0300
Committer: Ivan Rakov <iv...@gmail.com>
Committed: Tue May 23 18:25:04 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/MarshallerContextImpl.java | 6 +--
modules/pds/pom.xml | 49 ++++++++++++++++++++
.../cache/database/GridCacheOffheapManager.java | 3 ++
.../resources/META-INF/classnames.properties | 28 +++++++++++
4 files changed, 83 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1c825f0/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 40f104e..265481e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -126,11 +126,11 @@ public class MarshallerContextImpl implements MarshallerContext {
if (plugins != null && !plugins.isEmpty()) {
for (PluginProvider plugin : plugins) {
- URL pluginClsNames = ldr.getResource("META-INF/" + plugin.name().toLowerCase()
+ Enumeration<URL> pluginUrls = ldr.getResources("META-INF/" + plugin.name().toLowerCase()
+ ".classnames.properties");
- if (pluginClsNames != null)
- processResource(pluginClsNames);
+ while (pluginUrls.hasMoreElements())
+ processResource(pluginUrls.nextElement());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1c825f0/modules/pds/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pds/pom.xml b/modules/pds/pom.xml
index 01385a2..3bbccb9 100644
--- a/modules/pds/pom.xml
+++ b/modules/pds/pom.xml
@@ -115,6 +115,55 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <includePluginDependencies>true</includePluginDependencies>
+ <mainClass>org.apache.ignite.tools.classgen.ClassesGenerator</mainClass>
+ <arguments>
+ <argument>${project.basedir}/target/classes</argument>
+ <argument>
+ <![CDATA[
+#
+# 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.
+#
+ ]]>
+ </argument>
+ <argument>org.apache.ignite</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1c825f0/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
index 5253818..1bef00b 100644
--- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
+++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java
@@ -472,6 +472,9 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
*
*/
private static class RebalanceIteratorAdapter implements IgniteRebalanceIterator {
+ /** Serial version uid. */
+ private static final long serialVersionUID = 0L;
+
/** Cache context. */
private GridCacheContext cctx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1c825f0/modules/pds/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/resources/META-INF/classnames.properties b/modules/pds/src/main/resources/META-INF/classnames.properties
new file mode 100644
index 0000000..3003e5f
--- /dev/null
+++ b/modules/pds/src/main/resources/META-INF/classnames.properties
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+org.apache.ignite.internal.processors.cache.database.FullPageIdIterableComparator
+org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager$11
+org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager$7
+org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager$CheckpointEntryType
+org.apache.ignite.internal.processors.cache.database.GridCacheOffheapManager$RebalanceIteratorAdapter
+org.apache.ignite.internal.processors.cache.database.pagemem.PageMemoryImpl$Segment
+org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager$FileArchiver$1
+org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager$Mode
+org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager$RecordsIterator
+org.apache.ignite.internal.processors.cache.database.wal.SegmentEofException
+org.apache.ignite.internal.processors.cache.database.wal.crc.IgniteDataIntegrityViolationException