~akiban-technologies/akiban-server/trunk

Viewing changes to src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java

Committer: build-akiban
Date: 2013-07-26 22:37:38 UTC
mfrom: (2710.4.16 sequence-fix-and-tweak)
Revision ID: build@akiban.com-20130726223738-taf9n451mao3k3jk

merge nwilliams: Change SERIAL back to BY DEFAULT, fix div by zero on maximum range cycling sequence and underlying support for ALTER SEQUENCE.

https://code.launchpad.net/~nwilliams/akiban-server/sequence-fix-and-tweak/+merge/177031

files added:
src/test/java/com/akiban/ais/model/SequenceTest.java

src/test/resources/com/akiban/sql/pg/yaml/functional/test-alter-sequence.yaml

files modified:
src/main/java/com/akiban/ais/model/AISBuilder.java

src/main/java/com/akiban/ais/model/AkibanInformationSchema.java

src/main/java/com/akiban/ais/model/Sequence.java

src/main/java/com/akiban/server/api/DDLFunctions.java

src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java

src/main/java/com/akiban/server/service/dxl/DXLFunctionsHook.java

src/main/java/com/akiban/server/service/dxl/DXLServiceImpl.java

src/main/java/com/akiban/server/service/dxl/DXLTransactionHook.java

src/main/java/com/akiban/server/service/dxl/HookableDDLFunctions.java

src/main/java/com/akiban/server/store/AbstractSchemaManager.java

src/main/java/com/akiban/server/store/PersistitStore.java

src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java

src/main/java/com/akiban/server/store/SchemaManager.java

src/main/java/com/akiban/server/store/Store.java

src/main/java/com/akiban/sql/aisddl/TableDDL.java

src/test/java/com/akiban/server/api/ddl/DDLFunctionsMockBase.java

src/test/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImplTest.java

src/test/java/com/akiban/server/test/ApiTestBase.java

src/test/java/com/akiban/server/test/it/dxl/DropTreesIT.java

src/test/java/com/akiban/server/test/it/store/SchemaManagerIT.java

src/test/java/com/akiban/sql/aisddl/AlterTableDDLTest.java

src/test/java/com/akiban/sql/aisddl/TableDDLIT.java

src/test/resources/com/akiban/server/entity/changes/add-identity-property-update.ais

src/test/resources/com/akiban/server/entity/changes/drop-identity-property-orig.ais

src/test/resources/com/akiban/sql/pg/yaml/functional/test-sequence.yaml

Show diffs side-by-side

added added

removed removed

src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java

337

@Override

338

public AkibanInformationSchema runAndReturn(Session session) throws PersistitException {

339

// Unrelated to loading, but fine time to do it

340

cleanupDelayedTrees(session);

340

cleanupDelayedTrees(session, true);

341

342

SharedAIS sAIS = loadAISFromStorage(session, GenValue.SNAPSHOT, GenMap.PUT_NEW);

343

791

}

792

793

/** Public for test only. Should not generally be called. */

794

public void cleanupDelayedTrees(final Session session) throws PersistitException {

794

public void cleanupDelayedTrees(final Session session, final boolean clearMemoryTables) throws PersistitException {

795

treeService.visitStorage(

796

session,

797

new TreeVisitor() {

798

@Override

799

public void visit(final Exchange ex) throws PersistitException {

800

// Don't reload memory table definitions

801

ex.clear().append(AIS_MEMORY_TABLE_KEY).remove();

800

if(clearMemoryTables) {

801

// Don't reload memory table definitions

802

ex.clear().append(AIS_MEMORY_TABLE_KEY).remove();

803

}

802

804

// Clear old trees

803

805

ex.clear().append(DELAYED_TREE_KEY);

804

806

KeyFilter filter = new KeyFilter().append(KeyFilter.simpleTerm(DELAYED_TREE_KEY));

Older »