Remove explore-by-example, mysql, and cassandra

polypheny · Oct 7, 2022 · fb58769 · fb58769
1 parent 7e847d9
commit fb58769
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 140 deletions.
diff --git a/core/src/main/java/org/polypheny/db/catalog/Adapter.java b/core/src/main/java/org/polypheny/db/catalog/Adapter.java
@@ -26,7 +26,7 @@ public enum Adapter {
     MONGODB( "org.polypheny.db.adapter.mongodb.MongoStore" ),
     HSQLDB( "org.polypheny.db.adapter.jdbc.stores.HsqldbStore" ),
     CSV( "org.polypheny.db.adapter.csv.CsvSource" ),
-    CASSANDRA( "org.polypheny.db.adapter.cassandra.CassandraStore" ),
+    //CASSANDRA( "org.polypheny.db.adapter.cassandra.CassandraStore" ),
     MONETDB( "org.polypheny.db.adapter.jdbc.stores.MonetdbStore" ),
     COTTONTAIL( "org.polypheny.db.adapter.cottontail.CottontailStore" ),
     POSTGRESQL( "org.polypheny.db.adapter.jdbc.stores.PostgresqlStore" ),
@@ -86,11 +86,11 @@ public Map<String, String> getDefaultSettings() {
                 settings.put( "directory", "classpath://hr" );
                 settings.put( "maxStringLength", "255" );
                 break;
-            case CASSANDRA:
+            /*case CASSANDRA:
                 settings.put( "mode", "docker" );
                 settings.put( "instanceId", "0" );
                 settings.put( "port", "9042" );
-                break;
+                break;*/
             case MONETDB:
                 settings.put( "mode", "docker" );
                 settings.put( "instanceId", "0" );

diff --git a/dbms/build.gradle b/dbms/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation project(":cypher-language")
     implementation project(":pig-language")
     implementation project(":cql-language")
-    implementation project(":cassandra-adapter")
+    //implementation project(":cassandra-adapter")
     implementation project(":cottontail-adapter")
     implementation project(":csv-adapter")
     implementation project(":ethereum-adapter")
@@ -44,7 +44,7 @@ dependencies {
     implementation project(":avatica-interface")
     implementation project(":http-interface")
     implementation project(":rest-interface")
-    implementation project(":explore-by-example")
+    //implementation project(":explore-by-example")
     implementation project(":monitoring")
 
     ////// Logging
@@ -216,12 +216,12 @@ licensee {
 
 compileJava {
     dependsOn(":avatica-interface:processResources")
-    dependsOn(":cassandra-adapter:processResources")
+    //dependsOn(":cassandra-adapter:processResources")
     dependsOn(":catalog:processResources")
     dependsOn(":cql-language:processResources")
     dependsOn(":csv-adapter:processResources")
     dependsOn(":ethereum-adapter:processResources")
-    dependsOn(":explore-by-example:processResources")
+    //dependsOn(":explore-by-example:processResources")
     dependsOn(":file-adapter:processResources")
     dependsOn(":http-interface:processResources")
     dependsOn(":jdbc-adapter:processResources")

diff --git a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
@@ -45,8 +45,6 @@
 import org.polypheny.db.ddl.DdlManager;
 import org.polypheny.db.ddl.DdlManagerImpl;
 import org.polypheny.db.docker.DockerManager;
-import org.polypheny.db.exploreByExample.ExploreManager;
-import org.polypheny.db.exploreByExample.ExploreQueryProcessor;
 import org.polypheny.db.gui.GuiUtils;
 import org.polypheny.db.gui.SplashHelper;
 import org.polypheny.db.gui.TrayGui;
@@ -379,9 +377,9 @@ public void join( final long millis ) throws InterruptedException {
         // Call DockerManager once to remove old containers
         DockerManager.getInstance();
 
-        final ExploreQueryProcessor exploreQueryProcessor = new ExploreQueryProcessor( transactionManager, authenticator ); // Explore-by-Example
+        /*final ExploreQueryProcessor exploreQueryProcessor = new ExploreQueryProcessor( transactionManager, authenticator ); // Explore-by-Example
         ExploreManager explore = ExploreManager.getInstance();
-        explore.setExploreQueryProcessor( exploreQueryProcessor );
+        explore.setExploreQueryProcessor( exploreQueryProcessor );*/
 
         // Add config and monitoring test page for UI testing
         if ( testMode ) {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 versionMajor = 0
-versionMinor = 7
-versionMicro = 1
+versionMinor = 8
+versionMicro = 0
 isRelease = false
 
 # org.gradle.parallel = true

diff --git a/information/src/main/java/org/polypheny/db/webui/InformationServer.java b/information/src/main/java/org/polypheny/db/webui/InformationServer.java
@@ -28,7 +28,7 @@
 import io.javalin.http.Context;
 import io.javalin.plugin.json.JsonMapper;
 import java.io.IOException;
-import java.util.Collections;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.websocket.api.Session;
 import org.jetbrains.annotations.NotNull;
@@ -180,7 +180,8 @@ private void informationRoutes( final Javalin http ) {
 
 
     public void getEnabledPlugins( final Context ctx ) {
-        ctx.json( Collections.singletonList( "Explore-By-Example" ) );
+        //ctx.json( Collections.singletonList( "Explore-By-Example" ) );
+        ctx.json( List.of() );
     }
 
 

diff --git a/jdbc-adapter/build.gradle b/jdbc-adapter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     implementation group: "org.hsqldb", name: "hsqldb", version: hsqldb_version  // HSQLDB License (BSD-style)
     implementation group: "org.postgresql", name: "postgresql", version: postgresql_version  // BSD 2-clause
     implementation group: "monetdb", name: "monetdb-jdbc-new", version: monetdb_version
-    implementation group: "org.mariadb.jdbc", name: "mariadb-java-client", version: mariadb_version // LGPL 2.1
+    //implementation group: "org.mariadb.jdbc", name: "mariadb-java-client", version: mariadb_version // LGPL 2.1
 
 
     // --- Test Compile ---

diff --git a/jdbc-adapter/src/main/java/org/polypheny/db/adapter/jdbc/sources/MysqlSource.java b/jdbc-adapter/src/main/java/org/polypheny/db/adapter/jdbc/sources/MysqlSource.java
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ include 'mql-language'
 include 'pig-language'
 include 'cql-language'
 include 'cypher-language'
-include 'cassandra-adapter'
+//include 'cassandra-adapter'
 include 'csv-adapter'
 include 'druid-adapter'
 include 'elasticsearch-adapter'
@@ -24,7 +24,7 @@ include 'catalog'
 include 'config'
 include 'information'
 include 'monitoring'
-include 'explore-by-example'
+//include 'explore-by-example'
 include 'rest-interface'
 include 'cottontail-adapter'
 include 'ethereum-adapter'

diff --git a/webui/build.gradle b/webui/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation project(":cql-language")
     implementation project(":cypher-language")
     implementation project(":monitoring")
-    implementation project(":explore-by-example")
+    //implementation project(":explore-by-example")
 
     uiFiles group: "org.polypheny", name: "polypheny-ui", version: polypheny_ui_version
 
@@ -66,7 +66,7 @@ sourceSets {
 compileJava {
     dependsOn(":cql-language:processResources")
     dependsOn(":cypher-language:processResources")
-    dependsOn(":explore-by-example:processResources")
+    //dependsOn(":explore-by-example:processResources")
     dependsOn(":mql-language:processResources")
     dependsOn(":pig-language:processResources")
 }

diff --git a/webui/src/main/java/org/polypheny/db/webui/Crud.java b/webui/src/main/java/org/polypheny/db/webui/Crud.java
@@ -145,8 +145,6 @@
 import org.polypheny.db.ddl.DdlManager;
 import org.polypheny.db.ddl.exception.ColumnNotExistsException;
 import org.polypheny.db.docker.DockerManager;
-import org.polypheny.db.exploreByExample.Explore;
-import org.polypheny.db.exploreByExample.ExploreManager;
 import org.polypheny.db.iface.QueryInterface;
 import org.polypheny.db.iface.QueryInterfaceManager;
 import org.polypheny.db.iface.QueryInterfaceManager.QueryInterfaceInformation;
@@ -186,7 +184,6 @@
 import org.polypheny.db.webui.models.AdapterModel;
 import org.polypheny.db.webui.models.DbColumn;
 import org.polypheny.db.webui.models.DbTable;
-import org.polypheny.db.webui.models.ExploreResult;
 import org.polypheny.db.webui.models.ForeignKey;
 import org.polypheny.db.webui.models.HubMeta;
 import org.polypheny.db.webui.models.HubMeta.TableMapping;
@@ -210,16 +207,12 @@
 import org.polypheny.db.webui.models.UnderlyingTables;
 import org.polypheny.db.webui.models.requests.BatchUpdateRequest;
 import org.polypheny.db.webui.models.requests.BatchUpdateRequest.Update;
-import org.polypheny.db.webui.models.requests.ClassifyAllData;
 import org.polypheny.db.webui.models.requests.ColumnRequest;
 import org.polypheny.db.webui.models.requests.ConstraintRequest;
 import org.polypheny.db.webui.models.requests.EditTableRequest;
-import org.polypheny.db.webui.models.requests.ExploreData;
-import org.polypheny.db.webui.models.requests.ExploreTables;
 import org.polypheny.db.webui.models.requests.HubRequest;
 import org.polypheny.db.webui.models.requests.PartitioningRequest;
 import org.polypheny.db.webui.models.requests.PartitioningRequest.ModifyPartitionRequest;
-import org.polypheny.db.webui.models.requests.QueryExplorationRequest;
 import org.polypheny.db.webui.models.requests.QueryRequest;
 import org.polypheny.db.webui.models.requests.RelAlgRequest;
 import org.polypheny.db.webui.models.requests.SchemaTreeRequest;
@@ -920,7 +913,7 @@ public static void attachQueryAnalyzer( InformationManager queryAnalyzer, long e
      * return possibly interesting Data to User
      */
     public void classifyData( final Context ctx ) {
-        ClassifyAllData classifyAllData = ctx.bodyAsClass( ClassifyAllData.class );
+        /*ClassifyAllData classifyAllData = ctx.bodyAsClass( ClassifyAllData.class );
         ExploreManager exploreManager = ExploreManager.getInstance();
 
         boolean isConvertedToSql = isClassificationToSql();
@@ -964,15 +957,15 @@ public void classifyData( final Context ctx ) {
             result.setConvertedToSql( isConvertedToSql );
             ctx.json( result );
         }
-
+*/
     }
 
 
     /**
      * For pagination within the Explore-by-Example table
      */
     public void getExploreTables( final Context ctx ) {
-        ExploreTables exploreTables = ctx.bodyAsClass( ExploreTables.class );
+        /*ExploreTables exploreTables = ctx.bodyAsClass( ExploreTables.class );
         Transaction transaction = getTransaction();
         Statement statement = transaction.createStatement();
 
@@ -1049,15 +1042,15 @@ public void getExploreTables( final Context ctx ) {
             result.setClassifiedData( paginationData );
         }
         ctx.json( result );
-
+*/
     }
 
 
     /**
      * Creates the initial query for the Explore-by-Example process
      */
     public void createInitialExploreQuery( final Context ctx ) {
-        QueryExplorationRequest queryExplorationRequest = ctx.bodyAsClass( QueryExplorationRequest.class );
+        /* QueryExplorationRequest queryExplorationRequest = ctx.bodyAsClass( QueryExplorationRequest.class );
         ExploreManager exploreManager = ExploreManager.getInstance();
 
         Result result;
@@ -1094,15 +1087,15 @@ public void createInitialExploreQuery( final Context ctx ) {
         result.setCurrentPage( queryExplorationRequest.cPage ).setTable( queryExplorationRequest.tableId );
         result.setHighestPage( (int) Math.ceil( (double) explore.getTableSize() / getPageSize() ) );
 
-        ctx.json( result );
+        ctx.json( result );*/
     }
 
 
     /**
      * Start Classification, classifies the initial dataset, to show what would be within the final result set
      */
     public void exploration( final Context ctx ) {
-        ExploreData exploreData = ctx.bodyAsClass( ExploreData.class );
+        /*ExploreData exploreData = ctx.bodyAsClass( ExploreData.class );
 
         String[] dataType = new String[exploreData.header.length + 1];
         for ( int i = 0; i < exploreData.header.length; i++ ) {
@@ -1113,7 +1106,7 @@ public void exploration( final Context ctx ) {
         ExploreManager e = ExploreManager.getInstance();
         Explore explore = e.exploreData( exploreData.id, exploreData.classified, dataType );
 
-        ctx.json( new ExploreResult( exploreData.header, explore.getDataAfterClassification(), explore.getId(), explore.getBuildGraph() ) );
+        ctx.json( new ExploreResult( exploreData.header, explore.getDataAfterClassification(), explore.getId(), explore.getBuildGraph() ) );*/
     }