[01/13] ignite git commit: IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Repository: ignite
Updated Branches:
refs/heads/ignite-10043 9a6d642f8 -> bc1ac15c3
IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Signed-off-by: Ivan Rakov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a74d9c4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a74d9c4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a74d9c4f
Branch: refs/heads/ignite-10043
Commit: a74d9c4f66f407bfde56173a727b2545cc3bfb99
Parents: 3c54f38
Author: Alexey Stelmak
Authored: Thu Nov 15 15:28:22 2018 +0300
Committer: Ivan Rakov
Committed: Thu Nov 15 15:28:22 2018 +0300
--
.../internal/pagemem/PageIdAllocator.java | 3 +
.../persistence/metastorage/MetaStorage.java| 7 ++
.../metastorage/MetastorageTree.java| 9 +++
.../metastorage/IgniteMetaStorageBasicTest.java | 78
4 files changed, 97 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
index c6aeabe..b3e4b07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
@@ -35,6 +35,9 @@ public interface PageIdAllocator {
/** Special partition reserved for index space. */
public static final int INDEX_PARTITION = 0x;
+/** Special partition reserved for metastore space. */
+public static final int METASTORE_PARTITION = 0x0;
+
/**
* Allocates a page from the space for the given partition ID and the
given flags.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
index 4a243aa..91fbec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
@@ -28,6 +28,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.pagemem.FullPageId;
+import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
@@ -62,6 +63,7 @@ import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.jetbrains.annotations.NotNull;
+import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
import static org.apache.ignite.internal.pagemem.PageIdUtils.itemId;
import static org.apache.ignite.internal.pagemem.PageIdUtils.pageId;
@@ -507,6 +509,11 @@ public class MetaStorage implements DbCheckpointListener,
ReadOnlyMetastorage, R
return SimpleDataPageIO.VERSIONS;
}
+/** {@inheritDoc} */
+@Override protected long allocatePageNoReuse() throws
IgniteCheckedException {
+return pageMem.allocatePage(grpId,
PageIdAllocator.METASTORE_PARTITION, FLAG_DATA);
+}
+
/**
* Read row from data pages.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
index 00db5cd..27de684 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
@@ -19,6 +19,7 @@ package
ignite git commit: IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Repository: ignite
Updated Branches:
refs/heads/master 3c54f3894 -> a74d9c4f6
IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Signed-off-by: Ivan Rakov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a74d9c4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a74d9c4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a74d9c4f
Branch: refs/heads/master
Commit: a74d9c4f66f407bfde56173a727b2545cc3bfb99
Parents: 3c54f38
Author: Alexey Stelmak
Authored: Thu Nov 15 15:28:22 2018 +0300
Committer: Ivan Rakov
Committed: Thu Nov 15 15:28:22 2018 +0300
--
.../internal/pagemem/PageIdAllocator.java | 3 +
.../persistence/metastorage/MetaStorage.java| 7 ++
.../metastorage/MetastorageTree.java| 9 +++
.../metastorage/IgniteMetaStorageBasicTest.java | 78
4 files changed, 97 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
index c6aeabe..b3e4b07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
@@ -35,6 +35,9 @@ public interface PageIdAllocator {
/** Special partition reserved for index space. */
public static final int INDEX_PARTITION = 0x;
+/** Special partition reserved for metastore space. */
+public static final int METASTORE_PARTITION = 0x0;
+
/**
* Allocates a page from the space for the given partition ID and the
given flags.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
index 4a243aa..91fbec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
@@ -28,6 +28,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.pagemem.FullPageId;
+import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
@@ -62,6 +63,7 @@ import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.jetbrains.annotations.NotNull;
+import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
import static org.apache.ignite.internal.pagemem.PageIdUtils.itemId;
import static org.apache.ignite.internal.pagemem.PageIdUtils.pageId;
@@ -507,6 +509,11 @@ public class MetaStorage implements DbCheckpointListener,
ReadOnlyMetastorage, R
return SimpleDataPageIO.VERSIONS;
}
+/** {@inheritDoc} */
+@Override protected long allocatePageNoReuse() throws
IgniteCheckedException {
+return pageMem.allocatePage(grpId,
PageIdAllocator.METASTORE_PARTITION, FLAG_DATA);
+}
+
/**
* Read row from data pages.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
index 00db5cd..27de684 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
@@ -19,6 +19,7 @@ package
