|
16 | 16 |
|
17 | 17 | package com.orientechnologies.orient.core.storage.impl.local.paginated;
|
18 | 18 |
|
| 19 | +import java.io.File; |
| 20 | +import java.io.FileNotFoundException; |
| 21 | +import java.io.IOException; |
| 22 | +import java.util.ArrayList; |
| 23 | +import java.util.Arrays; |
| 24 | +import java.util.Comparator; |
| 25 | +import java.util.HashMap; |
| 26 | +import java.util.HashSet; |
| 27 | +import java.util.List; |
| 28 | +import java.util.Map; |
| 29 | +import java.util.Set; |
| 30 | +import java.util.concurrent.Callable; |
| 31 | +import java.util.concurrent.ConcurrentHashMap; |
| 32 | +import java.util.concurrent.ConcurrentMap; |
| 33 | +import java.util.concurrent.CopyOnWriteArrayList; |
| 34 | +import java.util.concurrent.ExecutorService; |
| 35 | +import java.util.concurrent.Executors; |
| 36 | +import java.util.concurrent.ScheduledExecutorService; |
| 37 | +import java.util.concurrent.ThreadFactory; |
| 38 | +import java.util.concurrent.TimeUnit; |
| 39 | + |
19 | 40 | import com.orientechnologies.common.concur.lock.OLockManager;
|
20 | 41 | import com.orientechnologies.common.concur.lock.OModificationLock;
|
21 | 42 | import com.orientechnologies.common.exception.OException;
|
|
64 | 85 | import com.orientechnologies.orient.core.storage.impl.local.OStorageVariableParser;
|
65 | 86 | import com.orientechnologies.orient.core.storage.impl.local.paginated.atomicoperations.OAtomicOperationsManager;
|
66 | 87 | import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage;
|
67 |
| -import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.*; |
| 88 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OAbstractCheckPointStartRecord; |
| 89 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OAtomicUnitEndRecord; |
| 90 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OAtomicUnitStartRecord; |
| 91 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OCheckpointEndRecord; |
| 92 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.ODirtyPage; |
| 93 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.ODirtyPagesRecord; |
| 94 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OFileCreatedCreatedWALRecord; |
| 95 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OFullCheckpointStartRecord; |
| 96 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OFuzzyCheckpointEndRecord; |
| 97 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OFuzzyCheckpointStartRecord; |
| 98 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OLogSequenceNumber; |
| 99 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OOperationUnitId; |
| 100 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OOperationUnitRecord; |
| 101 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OPaginatedClusterFactory; |
| 102 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OUpdatePageRecord; |
| 103 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALPageBrokenException; |
| 104 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWALRecord; |
| 105 | +import com.orientechnologies.orient.core.storage.impl.local.paginated.wal.OWriteAheadLog; |
68 | 106 | import com.orientechnologies.orient.core.tx.OTransaction;
|
69 | 107 | import com.orientechnologies.orient.core.tx.OTransactionAbstract;
|
70 | 108 | import com.orientechnologies.orient.core.tx.OTxListener;
|
71 | 109 | import com.orientechnologies.orient.core.type.tree.provider.OMVRBTreeRIDProvider;
|
72 | 110 | import com.orientechnologies.orient.core.version.ORecordVersion;
|
73 | 111 | import com.orientechnologies.orient.core.version.OVersionFactory;
|
74 | 112 |
|
75 |
| -import java.io.File; |
76 |
| -import java.io.FileNotFoundException; |
77 |
| -import java.io.IOException; |
78 |
| -import java.util.ArrayList; |
79 |
| -import java.util.Arrays; |
80 |
| -import java.util.Comparator; |
81 |
| -import java.util.HashMap; |
82 |
| -import java.util.HashSet; |
83 |
| -import java.util.List; |
84 |
| -import java.util.Map; |
85 |
| -import java.util.Set; |
86 |
| -import java.util.concurrent.Callable; |
87 |
| -import java.util.concurrent.ConcurrentHashMap; |
88 |
| -import java.util.concurrent.ConcurrentMap; |
89 |
| -import java.util.concurrent.CopyOnWriteArrayList; |
90 |
| -import java.util.concurrent.ExecutorService; |
91 |
| -import java.util.concurrent.Executors; |
92 |
| -import java.util.concurrent.ScheduledExecutorService; |
93 |
| -import java.util.concurrent.ThreadFactory; |
94 |
| -import java.util.concurrent.TimeUnit; |
95 |
| - |
96 | 113 | /**
|
97 | 114 | * @author Andrey Lomakin
|
98 | 115 | * @since 28.03.13
|
@@ -1016,14 +1033,14 @@ public int getClusterIdByName(final String сlusterName) {
|
1016 | 1033 | return -1;
|
1017 | 1034 | }
|
1018 | 1035 |
|
1019 |
| - public String getClusterTypeByName(final String сlusterName) { |
| 1036 | + public String getClusterTypeByName(final String clusterName) { |
1020 | 1037 | checkOpeness();
|
1021 | 1038 |
|
1022 |
| - if (сlusterName == null) |
| 1039 | + if (clusterName == null) |
1023 | 1040 | throw new IllegalArgumentException("Cluster name is null");
|
1024 | 1041 |
|
1025 | 1042 | // SEARCH IT BETWEEN PHYSICAL CLUSTERS
|
1026 |
| - final OCluster segment = clusterMap.get(сlusterName.toLowerCase()); |
| 1043 | + final OCluster segment = clusterMap.get(clusterName.toLowerCase()); |
1027 | 1044 | if (segment != null)
|
1028 | 1045 | return segment.getType();
|
1029 | 1046 |
|
@@ -1270,7 +1287,7 @@ public void freeze(boolean throwException) {
|
1270 | 1287 | modificationLock.allowModifications();
|
1271 | 1288 | try {
|
1272 | 1289 | lock();
|
1273 |
| - } catch (IOException e1) { |
| 1290 | + } catch (IOException ignored) { |
1274 | 1291 | }
|
1275 | 1292 | throw new OStorageException("Error on freeze of storage '" + name + "'", e);
|
1276 | 1293 | }
|
@@ -2074,16 +2091,16 @@ private void checkClusterSegmentIndexRange(final int iClusterId) {
|
2074 | 2091 | throw new IllegalArgumentException("Cluster segment #" + iClusterId + " does not exist in database '" + name + "'");
|
2075 | 2092 | }
|
2076 | 2093 |
|
2077 |
| - private int createClusterFromConfig(final OStorageClusterConfiguration сonfig) throws IOException { |
2078 |
| - OCluster cluster = clusterMap.get(сonfig.getName().toLowerCase()); |
| 2094 | + private int createClusterFromConfig(final OStorageClusterConfiguration config) throws IOException { |
| 2095 | + OCluster cluster = clusterMap.get(config.getName().toLowerCase()); |
2079 | 2096 |
|
2080 | 2097 | if (cluster != null) {
|
2081 |
| - cluster.configure(this, сonfig); |
| 2098 | + cluster.configure(this, config); |
2082 | 2099 | return -1;
|
2083 | 2100 | }
|
2084 | 2101 |
|
2085 | 2102 | cluster = OPaginatedClusterFactory.INSTANCE.createCluster(configuration.version);
|
2086 |
| - cluster.configure(this, сonfig); |
| 2103 | + cluster.configure(this, config); |
2087 | 2104 |
|
2088 | 2105 | return registerCluster(cluster);
|
2089 | 2106 | }
|
|
0 commit comments