Skip to content

Commit d35a634

Browse files
tglmantglman
committed
refactor: renamed internal implementation associated to the session with the session name
1 parent 15560a6 commit d35a634

File tree

27 files changed

+121
-121
lines changed

27 files changed

+121
-121
lines changed

‎client/src/main/java/com/orientechnologies/orient/client/remote/db/document/ODatabaseDocumentRemote.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
import com.orientechnologies.orient.core.id.ORecordId;
6161
import com.orientechnologies.orient.core.index.OClassIndexManager;
6262
import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
63-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
63+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
6464
import com.orientechnologies.orient.core.metadata.schema.OClass;
6565
import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
66-
import com.orientechnologies.orient.core.metadata.schema.OSchemaProxy;
66+
import com.orientechnologies.orient.core.metadata.schema.OSessionSchema;
6767
import com.orientechnologies.orient.core.metadata.security.OImmutableUser;
6868
import com.orientechnologies.orient.core.metadata.security.ORole;
6969
import com.orientechnologies.orient.core.metadata.security.ORule;
@@ -259,7 +259,7 @@ private void initAtFirstOpen() {
259259

260260
@Override
261261
protected void loadMetadata() {
262-
metadata = new OMetadataDefault(this);
262+
metadata = new OSessionMetadata(this);
263263
metadata.init(sharedContext);
264264
sharedContext.load(this);
265265
}
@@ -876,7 +876,7 @@ public long getClusterRecordSizeByName(final String clusterName) {
876876
public boolean dropCluster(final String iClusterName) {
877877
checkIfActive();
878878
final int clusterId = getClusterIdByName(iClusterName);
879-
OSchemaProxy schema = metadata.getSchema();
879+
OSessionSchema schema = metadata.getSchema();
880880
OClass clazz = schema.getClassByClusterId(clusterId);
881881
if (clazz != null) clazz.removeClusterId(clusterId);
882882
if (schema.getBlobClusters().contains(clusterId)) schema.removeBlobCluster(iClusterName);
@@ -889,7 +889,7 @@ public boolean dropCluster(final String iClusterName) {
889889
public boolean dropCluster(final int clusterId) {
890890
checkIfActive();
891891

892-
OSchemaProxy schema = metadata.getSchema();
892+
OSessionSchema schema = metadata.getSchema();
893893
final OClass clazz = schema.getClassByClusterId(clusterId);
894894
if (clazz != null) clazz.removeClusterId(clusterId);
895895
getLocalCache().freeCluster(clusterId);

‎core/src/main/java/com/orientechnologies/orient/core/db/OSharedContextEmbedded.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.orientechnologies.orient.core.index.OIndexFactory;
99
import com.orientechnologies.orient.core.index.OIndexManagerShared;
1010
import com.orientechnologies.orient.core.index.OIndexes;
11-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
11+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
1212
import com.orientechnologies.orient.core.metadata.function.OFunctionLibraryImpl;
1313
import com.orientechnologies.orient.core.metadata.schema.OClass;
1414
import com.orientechnologies.orient.core.metadata.schema.OSchemaEmbedded;
@@ -178,7 +178,7 @@ public synchronized void reInit(OStorage storage, ODatabaseDocumentInternal data
178178
this.close();
179179
this.storage = storage;
180180
this.init(storage);
181-
((OMetadataDefault) database.getMetadata()).init(this);
181+
((OSessionMetadata) database.getMetadata()).init(this);
182182
this.load(database);
183183
}
184184

‎core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentAbstract.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import com.orientechnologies.orient.core.iterator.ORecordIteratorClass;
5858
import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
5959
import com.orientechnologies.orient.core.metadata.OMetadata;
60-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
60+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
6161
import com.orientechnologies.orient.core.metadata.schema.OClass;
6262
import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
6363
import com.orientechnologies.orient.core.metadata.schema.OImmutableView;
@@ -129,7 +129,7 @@ public abstract class ODatabaseDocumentAbstract extends OListenerManger<ODatabas
129129
protected String url;
130130
protected STATUS status;
131131
protected ODatabaseInternal<?> databaseOwner;
132-
protected OMetadataDefault metadata;
132+
protected OSessionMetadata metadata;
133133
protected OImmutableUser user;
134134
protected final byte recordType = ODocument.RECORD_TYPE;
135135
protected final Map<ORecordHook, ORecordHook.HOOK_POSITION> hooks =
@@ -296,7 +296,7 @@ public byte getRecordType() {
296296
}
297297

298298
/** {@inheritDoc} */
299-
public OMetadataDefault getMetadata() {
299+
public OSessionMetadata getMetadata() {
300300
checkOpenness();
301301
return metadata;
302302
}

‎core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@
6363
import com.orientechnologies.orient.core.id.ORecordId;
6464
import com.orientechnologies.orient.core.index.OClassIndexManager;
6565
import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
66-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
66+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
6767
import com.orientechnologies.orient.core.metadata.function.OFunctionLibraryImpl;
6868
import com.orientechnologies.orient.core.metadata.schema.OClass;
6969
import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
7070
import com.orientechnologies.orient.core.metadata.schema.OImmutableSchema;
71-
import com.orientechnologies.orient.core.metadata.schema.OSchemaProxy;
71+
import com.orientechnologies.orient.core.metadata.schema.OSessionSchema;
7272
import com.orientechnologies.orient.core.metadata.schema.OView;
7373
import com.orientechnologies.orient.core.metadata.security.OImmutableUser;
7474
import com.orientechnologies.orient.core.metadata.security.OPropertyAccess;
@@ -83,7 +83,7 @@
8383
import com.orientechnologies.orient.core.metadata.security.OUser;
8484
import com.orientechnologies.orient.core.metadata.security.auth.OAuthenticationInfo;
8585
import com.orientechnologies.orient.core.metadata.sequence.OSequenceAction;
86-
import com.orientechnologies.orient.core.metadata.sequence.OSequenceLibraryProxy;
86+
import com.orientechnologies.orient.core.metadata.sequence.OSessionSequenceLibrary;
8787
import com.orientechnologies.orient.core.query.live.OLiveQueryHook;
8888
import com.orientechnologies.orient.core.query.live.OLiveQueryHookV2;
8989
import com.orientechnologies.orient.core.query.live.OLiveQueryListenerV2;
@@ -305,7 +305,7 @@ public void internalCreate(OrientDBConfig config, OSharedContext ctx) {
305305
// THIS IF SHOULDN'T BE NEEDED, CREATE HAPPEN ONLY IN EMBEDDED
306306
applyAttributes(config);
307307
applyListeners(config);
308-
metadata = new OMetadataDefault(this);
308+
metadata = new OSessionMetadata(this);
309309
installHooksEmbedded();
310310
createMetadata(ctx);
311311
}
@@ -330,7 +330,7 @@ protected void createMetadata(OSharedContext shared) {
330330

331331
@Override
332332
protected void loadMetadata() {
333-
metadata = new OMetadataDefault(this);
333+
metadata = new OSessionMetadata(this);
334334
metadata.init(sharedContext);
335335
sharedContext.load(this);
336336
}
@@ -1167,7 +1167,7 @@ public void afterCreateOperations(final OIdentifiable id) {
11671167
sharedContext.getSecurity().incrementVersion(this);
11681168
}
11691169
if (clazz.isSequence()) {
1170-
((OSequenceLibraryProxy) getMetadata().getSequenceLibrary())
1170+
((OSessionSequenceLibrary) getMetadata().getSequenceLibrary())
11711171
.getDelegate()
11721172
.onSequenceCreated(this, doc);
11731173
}
@@ -1198,7 +1198,7 @@ public void afterUpdateOperations(final OIdentifiable id) {
11981198
sharedContext.getSecurity().incrementVersion(this);
11991199
}
12001200
if (clazz.isSequence()) {
1201-
((OSequenceLibraryProxy) getMetadata().getSequenceLibrary())
1201+
((OSessionSequenceLibrary) getMetadata().getSequenceLibrary())
12021202
.getDelegate()
12031203
.onSequenceUpdated(this, doc);
12041204
}
@@ -1224,7 +1224,7 @@ public void afterDeleteOperations(final OIdentifiable id) {
12241224
this.getSharedContext().getFunctionLibrary().droppedFunction(doc);
12251225
}
12261226
if (clazz.isSequence()) {
1227-
((OSequenceLibraryProxy) getMetadata().getSequenceLibrary())
1227+
((OSessionSequenceLibrary) getMetadata().getSequenceLibrary())
12281228
.getDelegate()
12291229
.onSequenceDropped(this, doc);
12301230
}
@@ -1691,7 +1691,7 @@ public long countClusterElements(final String iClusterName) {
16911691
public boolean dropCluster(final String iClusterName) {
16921692
checkIfActive();
16931693
final int clusterId = getClusterIdByName(iClusterName);
1694-
OSchemaProxy schema = metadata.getSchema();
1694+
OSessionSchema schema = metadata.getSchema();
16951695
OClass clazz = schema.getClassByClusterId(clusterId);
16961696
if (clazz != null) clazz.removeClusterId(clusterId);
16971697
if (schema.getBlobClusters().contains(clusterId)) schema.removeBlobCluster(iClusterName);
@@ -1711,7 +1711,7 @@ public boolean dropCluster(final int clusterId) {
17111711
checkSecurity(
17121712
ORule.ResourceGeneric.CLUSTER, ORole.PERMISSION_DELETE, getClusterNameById(clusterId));
17131713

1714-
OSchemaProxy schema = metadata.getSchema();
1714+
OSessionSchema schema = metadata.getSchema();
17151715
final OClass clazz = schema.getClassByClusterId(clusterId);
17161716
if (clazz != null) clazz.removeClusterId(clusterId);
17171717
getLocalCache().freeCluster(clusterId);

‎core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseCompare.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.orientechnologies.orient.core.index.OIndex;
3333
import com.orientechnologies.orient.core.index.OIndexInternal;
3434
import com.orientechnologies.orient.core.index.OIndexManagerAbstract;
35-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
35+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
3636
import com.orientechnologies.orient.core.metadata.schema.OClass;
3737
import com.orientechnologies.orient.core.metadata.schema.OProperty;
3838
import com.orientechnologies.orient.core.metadata.schema.OSchema;
@@ -88,8 +88,8 @@ public ODatabaseCompare(
8888

8989
// exclude automatically generated clusters
9090
excludeClusters.add("orids");
91-
excludeClusters.add(OMetadataDefault.CLUSTER_INDEX_NAME);
92-
excludeClusters.add(OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME);
91+
excludeClusters.add(OSessionMetadata.CLUSTER_INDEX_NAME);
92+
excludeClusters.add(OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME);
9393

9494
excludeIndexes.add(ODatabaseImport.EXPORT_IMPORT_INDEX_NAME);
9595

‎core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImpExpAbstract.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.orientechnologies.orient.core.command.OCommandOutputListener;
2323
import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
2424
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
25-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
25+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
2626
import java.util.HashSet;
2727
import java.util.LinkedHashSet;
2828
import java.util.List;
@@ -74,8 +74,8 @@ public ODatabaseImpExpAbstract(
7474

7575
listener = iListener;
7676
excludeClusters = new LinkedHashSet<>();
77-
excludeClusters.add(OMetadataDefault.CLUSTER_INDEX_NAME);
78-
excludeClusters.add(OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME);
77+
excludeClusters.add(OSessionMetadata.CLUSTER_INDEX_NAME);
78+
excludeClusters.add(OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME);
7979
}
8080

8181
public Set<String> getIncludeClusters() {

‎core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseImport.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import com.orientechnologies.orient.core.index.OIndexManagerAbstract;
5050
import com.orientechnologies.orient.core.index.ORuntimeKeyIndexDefinition;
5151
import com.orientechnologies.orient.core.index.OSimpleKeyIndexDefinition;
52-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
52+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
5353
import com.orientechnologies.orient.core.metadata.function.OFunction;
5454
import com.orientechnologies.orient.core.metadata.schema.OClass;
5555
import com.orientechnologies.orient.core.metadata.schema.OClassEmbedded;
@@ -412,7 +412,7 @@ protected void removeDefaultClusters() {
412412

413413
// In v4 new cluster for manual indexes has been implemented. To keep database consistent we
414414
// should shift back all clusters and recreate cluster for manual indexes in the end.
415-
database.dropCluster(OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME);
415+
database.dropCluster(OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME);
416416

417417
final OSchema schema = database.getMetadata().getSchema();
418418
if (schema.existsClass(OUser.CLASS_NAME)) schema.dropClass(OUser.CLASS_NAME);
@@ -1132,7 +1132,7 @@ public void onCompletition(Object iTask, boolean iSucceed) {
11321132
listener.onMessage("\nDone " + indexesToRebuild.size() + " indexes were rebuilt.");
11331133

11341134
if (recreateManualIndex) {
1135-
database.addCluster(OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME);
1135+
database.addCluster(OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME);
11361136
database.getMetadata().getIndexManagerInternal().create();
11371137

11381138
listener.onMessage("\nManual index cluster was recreated.");
@@ -1143,7 +1143,7 @@ public void onCompletition(Object iTask, boolean iSucceed) {
11431143
new ORecordId(database.getStorageInfo().getConfiguration().getIndexMgrRecordId()))
11441144
== null) {
11451145
ODocument indexDocument = new ODocument();
1146-
database.save(indexDocument, OMetadataDefault.CLUSTER_INTERNAL_NAME);
1146+
database.save(indexDocument, OSessionMetadata.CLUSTER_INTERNAL_NAME);
11471147

11481148
database.getStorage().setIndexMgrRecordId(indexDocument.getIdentity().toString());
11491149
}
@@ -1260,7 +1260,7 @@ record =
12601260

12611261
if (exporterVersion >= 3) {
12621262
int oridsId = database.getClusterIdByName("ORIDs");
1263-
int indexId = database.getClusterIdByName(OMetadataDefault.CLUSTER_INDEX_NAME);
1263+
int indexId = database.getClusterIdByName(OSessionMetadata.CLUSTER_INDEX_NAME);
12641264

12651265
if (record.getIdentity().getClusterId() == indexId
12661266
|| record.getIdentity().getClusterId() == oridsId) {
@@ -1271,10 +1271,10 @@ record =
12711271
}
12721272

12731273
final int manualIndexCluster =
1274-
database.getClusterIdByName(OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME);
1274+
database.getClusterIdByName(OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME);
12751275
final int internalCluster =
1276-
database.getClusterIdByName(OMetadataDefault.CLUSTER_INTERNAL_NAME);
1277-
final int indexCluster = database.getClusterIdByName(OMetadataDefault.CLUSTER_INDEX_NAME);
1276+
database.getClusterIdByName(OSessionMetadata.CLUSTER_INTERNAL_NAME);
1277+
final int indexCluster = database.getClusterIdByName(OSessionMetadata.CLUSTER_INDEX_NAME);
12781278

12791279
if (exporterVersion >= 4) {
12801280
if (record.getIdentity().getClusterId() == manualIndexCluster) {
@@ -1731,9 +1731,9 @@ private void migrateLinksInImportedDocuments(Set<ORID> brokenRids) throws IOExce
17311731
long totalDocuments = 0;
17321732
Collection<String> clusterNames = database.getClusterNames();
17331733
for (String clusterName : clusterNames) {
1734-
if (OMetadataDefault.CLUSTER_INDEX_NAME.equals(clusterName)
1735-
|| OMetadataDefault.CLUSTER_INTERNAL_NAME.equals(clusterName)
1736-
|| OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME.equals(clusterName)) continue;
1734+
if (OSessionMetadata.CLUSTER_INDEX_NAME.equals(clusterName)
1735+
|| OSessionMetadata.CLUSTER_INTERNAL_NAME.equals(clusterName)
1736+
|| OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME.equals(clusterName)) continue;
17371737

17381738
long documents = 0;
17391739
String prefix = "";

‎core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerRemote.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.orientechnologies.orient.core.id.ORID;
3232
import com.orientechnologies.orient.core.id.ORecordId;
3333
import com.orientechnologies.orient.core.metadata.OMetadata;
34-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
34+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
3535
import com.orientechnologies.orient.core.metadata.OMetadataInternal;
3636
import com.orientechnologies.orient.core.record.ORecord;
3737
import com.orientechnologies.orient.core.record.ORecordInternal;
@@ -62,7 +62,7 @@ public class OIndexManagerRemote implements OIndexManagerAbstract {
6262
protected final Map<String, Map<OMultiKey, Set<OIndex>>> classPropertyIndex =
6363
new ConcurrentHashMap<>();
6464
protected Map<String, OIndex> indexes = new ConcurrentHashMap<>();
65-
protected String defaultClusterName = OMetadataDefault.CLUSTER_INDEX_NAME;
65+
protected String defaultClusterName = OSessionMetadata.CLUSTER_INDEX_NAME;
6666
protected final AtomicInteger writeLockNesting = new AtomicInteger();
6767
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
6868

‎core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerShared.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.orientechnologies.orient.core.id.ORID;
3737
import com.orientechnologies.orient.core.id.ORecordId;
3838
import com.orientechnologies.orient.core.metadata.OMetadata;
39-
import com.orientechnologies.orient.core.metadata.OMetadataDefault;
39+
import com.orientechnologies.orient.core.metadata.OSessionMetadata;
4040
import com.orientechnologies.orient.core.metadata.OMetadataInternal;
4141
import com.orientechnologies.orient.core.metadata.schema.OClass;
4242
import com.orientechnologies.orient.core.metadata.schema.OClassImpl;
@@ -81,8 +81,8 @@ public class OIndexManagerShared implements OIndexManagerAbstract {
8181
protected final Map<String, Map<OMultiKey, Set<OIndex>>> classPropertyIndex =
8282
new ConcurrentHashMap<>();
8383
protected Map<String, OIndex> indexes = new ConcurrentHashMap<>();
84-
protected String defaultClusterName = OMetadataDefault.CLUSTER_INDEX_NAME;
85-
protected String manualClusterName = OMetadataDefault.CLUSTER_MANUAL_INDEX_NAME;
84+
protected String defaultClusterName = OSessionMetadata.CLUSTER_INDEX_NAME;
85+
protected String manualClusterName = OSessionMetadata.CLUSTER_MANUAL_INDEX_NAME;
8686
protected final AtomicInteger writeLockNesting = new AtomicInteger();
8787
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
8888
protected ORID identity;
@@ -195,7 +195,7 @@ public void removeClusterFromIndex(final String clusterName, final String indexN
195195
public void create(ODatabaseDocumentInternal database) {
196196
acquireExclusiveLock();
197197
try {
198-
ODocument document = database.save(new ODocument(), OMetadataDefault.CLUSTER_INTERNAL_NAME);
198+
ODocument document = database.save(new ODocument(), OSessionMetadata.CLUSTER_INTERNAL_NAME);
199199
identity = document.getIdentity();
200200
database.getStorage().setIndexMgrRecordId(document.getIdentity().toString());
201201
} finally {

‎core/src/main/java/com/orientechnologies/orient/core/index/OIndexManagerProxy.java ‎core/src/main/java/com/orientechnologies/orient/core/index/OSessionIndexManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
import java.util.Collection;
2929
import java.util.Set;
3030

31-
public class OIndexManagerProxy extends OProxedResource<OIndexManagerAbstract>
31+
public class OSessionIndexManager extends OProxedResource<OIndexManagerAbstract>
3232
implements OIndexManager {
3333

34-
public OIndexManagerProxy(
34+
public OSessionIndexManager(
3535
final OIndexManagerAbstract iDelegate, final ODatabaseDocumentInternal iDatabase) {
3636
super(iDelegate, iDatabase);
3737
}
3838

3939
public void load() {}
4040

4141
/** Force reloading of indexes. */
42-
public OIndexManagerProxy reload() {
42+
public OSessionIndexManager reload() {
4343
delegate.load(database);
4444
return this;
4545
}

0 commit comments

Comments
 (0)