You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/12/14 10:01:57 UTC
[30/40] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 271ff33..2b0ad63 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryO
import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class IgniteBinaryObjectsTestSuite extends TestSuite {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
deleted file mode 100644
index 863350d..0000000
Binary files a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
deleted file mode 100644
index 533a3c9..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test1</artifactId>
- <version>1.1</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
deleted file mode 100644
index 4ca5d44..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test1</artifactId>
- <versioning>
- <release>1.1</release>
- <versions>
- <version>1.1</version>
- </versions>
- <lastUpdated>20140806090184</lastUpdated>
- </versioning>
-</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
deleted file mode 100644
index ccf4ea2..0000000
Binary files a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
deleted file mode 100644
index 2eaaeff..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test2</artifactId>
- <version>1.1</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
deleted file mode 100644
index c45c88f..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test2</artifactId>
- <versioning>
- <release>1.1</release>
- <versions>
- <version>1.1</version>
- </versions>
- <lastUpdated>20140806090410</lastUpdated>
- </versioning>
-</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 1437a16..8625be9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -519,13 +519,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* @param o Object.
- * @return {@code true} If it is a portable object.
+ * @return {@code true} If it is a binary object.
*/
- private boolean isPortable(CacheObject o) {
+ private boolean isBinary(CacheObject o) {
if (ctx == null)
return false;
- return ctx.cacheObjects().isPortableObject(o);
+ return ctx.cacheObjects().isBinaryObject(o);
}
/**
@@ -534,7 +534,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Object class.
*/
private Class<?> getClass(CacheObjectContext coctx, CacheObject o) {
- return isPortable(o) ?
+ return isBinary(o) ?
Object.class :
o.value(coctx, false).getClass();
}
@@ -1045,7 +1045,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
twoStepQry.pageSize(qry.getPageSize());
- QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepPortable()));
+ QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepBinary()));
cursor.fieldsMeta(meta);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 1d4fa30..828d9bd 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -448,10 +448,10 @@ public class GridReduceQueryExecutor {
/**
* @param cctx Cache context.
* @param qry Query.
- * @param keepPortable Keep portable.
+ * @param keepBinary Keep binary.
* @return Cursor.
*/
- public Iterator<List<?>> query(GridCacheContext<?,?> cctx, GridCacheTwoStepQuery qry, boolean keepPortable) {
+ public Iterator<List<?>> query(GridCacheContext<?,?> cctx, GridCacheTwoStepQuery qry, boolean keepBinary) {
for (int attempt = 0;; attempt++) {
if (attempt != 0) {
try {
@@ -652,7 +652,7 @@ public class GridReduceQueryExecutor {
continue;
}
- return new GridQueryCacheObjectsIterator(resIter, cctx, keepPortable);
+ return new GridQueryCacheObjectsIterator(resIter, cctx, keepBinary);
}
catch (IgniteCheckedException | RuntimeException e) {
U.closeQuiet(r.conn);
@@ -1240,4 +1240,4 @@ public class GridReduceQueryExecutor {
return res;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index a92451f..64a1115 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery<TestKey, String>(String.class, "field like '" + key + "'")).getAll();
- assertTrue("p2p marshalling failed, but error response was not sent", portableMarshaller());
+ assertTrue("p2p marshalling failed, but error response was not sent", binaryMarshaller());
}
catch (CacheException e) {
- assertFalse("Unexpected exception: " + e, portableMarshaller());
+ assertFalse("Unexpected exception: " + e, binaryMarshaller());
}
}
@@ -78,20 +78,20 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
}
})).getAll();
- assertTrue("Request unmarshalling failed, but error response was not sent.", portableMarshaller());
+ assertTrue("Request unmarshalling failed, but error response was not sent.", binaryMarshaller());
}
catch (Exception e) {
- assertFalse("Unexpected exception: " + e, portableMarshaller());
+ assertFalse("Unexpected exception: " + e, binaryMarshaller());
}
}
/**
- * @return {@code True} if portable marshaller is configured.
+ * @return {@code True} if binary marshaller is configured.
*/
- private boolean portableMarshaller() {
+ private boolean binaryMarshaller() {
IgniteEx kernal = (IgniteEx)ignite(0);
return !OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
.getSimpleName());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index daf9c45..786b5b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -51,7 +51,7 @@ import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest;
import org.apache.ignite.testframework.config.GridTestProperties;
/**
- * Cache query suite with portable marshaller.
+ * Cache query suite with binary marshaller.
*/
public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
/**
@@ -61,7 +61,7 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
- TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller");
+ TestSuite suite = new TestSuite("Grid Cache Query Test Suite using BinaryMarshaller");
// Parsing
suite.addTestSuite(GridQueryParsingTest.class);
@@ -92,8 +92,8 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
- //Should be adjusted. Not ready to be used with PortableMarshaller.
- //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class);
+ //Should be adjusted. Not ready to be used with BinaryMarshaller.
+ //suite.addTestSuite(GridCacheBinarySwapScanQuerySelfTest.class);
suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f2d363..486fc0d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -846,10 +846,10 @@
<exclude>dev-tools/.gradle/**/*</exclude>
<exclude>dev-tools/gradle/wrapper/**/*</exclude>
<exclude>dev-tools/gradlew</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
<!--shmem-->
<exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
<exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
@@ -875,8 +875,8 @@
<!--platforms-->
<exclude>src/main/java/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory</exclude>
<exclude>src/main/resources/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar</exclude>
<exclude>**/META-INF/services/*.PlatformBootstrapFactory</exclude>
<exclude>**/Makefile.am</exclude>
<exclude>**/configure.ac</exclude>