Skip to content

Commit

Permalink
Remove explore-by-example, mysql, cassandra, and unused adapter plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
vogti committed Oct 21, 2023
1 parent 5357ee5 commit ca66d3b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
adapter: [ mongodb, hsqldb, monetdb, postgresql, file, cottontail, cassandra, neo4j ]
adapter: [ mongodb, hsqldb, monetdb, postgresql, file, cottontail, neo4j ]
name: Integration Tests (Java 11)
steps:
- name: Checkout
Expand Down Expand Up @@ -43,4 +43,4 @@ jobs:
with:
max_attempts: 3
timeout_minutes: 30
command: ./gradlew integrationTests -Dstore.default=${{ matrix.adapter }}
command: ./gradlew integrationTests -Dstore.default=${{ matrix.adapter }}
2 changes: 2 additions & 0 deletions dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,13 @@ public void join( final long millis ) throws InterruptedException {
throw new RuntimeException( "There was no catalog submitted, aborting." );
}

log.info( "Searching for Docker" );
if ( AutoDocker.getInstance().isAvailable() ) {
if ( testMode ) {
resetDocker = true;
Catalog.resetDocker = true;
}
log.info( "Automatically configuring Docker" );
boolean success = AutoDocker.getInstance().doAutoConnect();
if ( testMode && !success ) {
// AutoDocker does not work in Windows containers
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#

versionMajor = 0
versionMinor = 10
versionMicro = 0
versionMinor = 9
versionMicro = 2
isRelease = false

# org.gradle.parallel = true
Expand Down
16 changes: 8 additions & 8 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ include 'plugins:hsqldb-adapter'
include 'plugins:neo4j-adapter'
include 'plugins:cottontail-adapter'
include 'plugins:ethereum-adapter'
include 'plugins:cassandra-adapter'
//include 'plugins:cassandra-adapter'
include 'plugins:csv-adapter'
include 'plugins:mysql-adapter'
//include 'plugins:mysql-adapter'
include 'plugins:postgres-adapter'
include 'plugins:monetdb-adapter'
include 'plugins:mongodb-adapter'
Expand All @@ -47,12 +47,12 @@ include 'plugins:google-sheet-adapter'
include 'plugins:excel-adapter'

// other plugins
include 'plugins:explore-by-example'
//include 'plugins:explore-by-example'
include 'plugins:notebooks'

// disabled adapter plugins
include 'plugins:pig-adapter'
include 'plugins:html-adapter'
include 'plugins:druid-adapter'
include 'plugins:elasticsearch-adapter'
include 'plugins:geode-adapter'
//include 'plugins:pig-adapter'
//include 'plugins:html-adapter'
//include 'plugins:druid-adapter'
//include 'plugins:elasticsearch-adapter'
//include 'plugins:geode-adapter'

0 comments on commit ca66d3b

Please sign in to comment.