Skip to content

Commit ca66d3b

Browse files
committed
Remove explore-by-example, mysql, cassandra, and unused adapter plugins
1 parent 5357ee5 commit ca66d3b

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
adapter: [ mongodb, hsqldb, monetdb, postgresql, file, cottontail, cassandra, neo4j ]
15+
adapter: [ mongodb, hsqldb, monetdb, postgresql, file, cottontail, neo4j ]
1616
name: Integration Tests (Java 11)
1717
steps:
1818
- name: Checkout
@@ -43,4 +43,4 @@ jobs:
4343
with:
4444
max_attempts: 3
4545
timeout_minutes: 30
46-
command: ./gradlew integrationTests -Dstore.default=${{ matrix.adapter }}
46+
command: ./gradlew integrationTests -Dstore.default=${{ matrix.adapter }}

dbms/src/main/java/org/polypheny/db/PolyphenyDb.java

+2
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,13 @@ public void join( final long millis ) throws InterruptedException {
419419
throw new RuntimeException( "There was no catalog submitted, aborting." );
420420
}
421421

422+
log.info( "Searching for Docker" );
422423
if ( AutoDocker.getInstance().isAvailable() ) {
423424
if ( testMode ) {
424425
resetDocker = true;
425426
Catalog.resetDocker = true;
426427
}
428+
log.info( "Automatically configuring Docker" );
427429
boolean success = AutoDocker.getInstance().doAutoConnect();
428430
if ( testMode && !success ) {
429431
// AutoDocker does not work in Windows containers

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#
1616

1717
versionMajor = 0
18-
versionMinor = 10
19-
versionMicro = 0
18+
versionMinor = 9
19+
versionMicro = 2
2020
isRelease = false
2121

2222
# org.gradle.parallel = true

settings.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ include 'plugins:hsqldb-adapter'
3636
include 'plugins:neo4j-adapter'
3737
include 'plugins:cottontail-adapter'
3838
include 'plugins:ethereum-adapter'
39-
include 'plugins:cassandra-adapter'
39+
//include 'plugins:cassandra-adapter'
4040
include 'plugins:csv-adapter'
41-
include 'plugins:mysql-adapter'
41+
//include 'plugins:mysql-adapter'
4242
include 'plugins:postgres-adapter'
4343
include 'plugins:monetdb-adapter'
4444
include 'plugins:mongodb-adapter'
@@ -47,12 +47,12 @@ include 'plugins:google-sheet-adapter'
4747
include 'plugins:excel-adapter'
4848

4949
// other plugins
50-
include 'plugins:explore-by-example'
50+
//include 'plugins:explore-by-example'
5151
include 'plugins:notebooks'
5252

5353
// disabled adapter plugins
54-
include 'plugins:pig-adapter'
55-
include 'plugins:html-adapter'
56-
include 'plugins:druid-adapter'
57-
include 'plugins:elasticsearch-adapter'
58-
include 'plugins:geode-adapter'
54+
//include 'plugins:pig-adapter'
55+
//include 'plugins:html-adapter'
56+
//include 'plugins:druid-adapter'
57+
//include 'plugins:elasticsearch-adapter'
58+
//include 'plugins:geode-adapter'

0 commit comments

Comments
 (0)