Skip to content

Added testConnection feature in CSV adapter. Issue #450 #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Ahmed-Elgamel wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Added testConnection feature in CSV adapter. Issue #450 #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffad8f2
Add testConnection method in DataSource
Ahmed-Elgamel Mar 3, 2024
4926352
Implement testConnection method in CSV Adapter
Ahmed-Elgamel Mar 3, 2024
cf9e96e
Add testConnection method for PostgresqlSource
Ahmed-Elgamel Mar 12, 2024
4985590
Add testConnection method for MysqlSource
Ahmed-Elgamel Mar 12, 2024
077d11e
Add testConnection method for MonetdbSource
Ahmed-Elgamel Mar 12, 2024
fe9c6bd
removed bracket
Ahmed-Elgamel Mar 12, 2024
2e93355
ADD testConnection method in Qfs DataSource
Ahmed-Elgamel Mar 12, 2024
f9fd6e4
ADD testConnection method in Excel DataSource
Ahmed-Elgamel Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/java/org/polypheny/db/adapter/DataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,7 @@ private AdapterType getAdapterType() {
return AdapterType.SOURCE;
}


public void testConnection(){}

}
31 changes: 31 additions & 0 deletions plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,35 @@ private void addInformationExportedColumns() {
}
}


public void testConnection(){
File directory = new File(csvDir.getPath());

// Check if the directory exists
if (!directory.exists() ) {
throw new Error("The specified path is not a valid directory.");
}

// List all files in the directory
File[] files = directory.listFiles();
if(files == null)
throw new Error("THERE IS NO CSV FILE TO UPLOAD. ");

int badFiles = 0;
if (files != null) {
// Check each file if it has a .csv extension
for (File file : files) {
System.out.println(file.getName());
if (!file.isFile() || !file.getName().toLowerCase().endsWith(".csv"))
badFiles++;

}
}

if(badFiles==files.length)
throw new Error("NO VALID CSV FILE FOUND. ");


}

}
26 changes: 26 additions & 0 deletions plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,30 @@ private void addInformationExportedColumns() {
}
}


@Override
public void testConnection() {

File directory = new File(excelDir.getPath());
// Check if the directory exists
if (!directory.exists() ) {
shutdown();
throw new Error("The specified path is not a valid directory.");
}
File[] files = directory.listFiles();

int goodFile=0;
for(File file : files){
String fileName = file.getName();
if(fileName.endsWith( ".xlsx" ) || fileName.endsWith( ".xlsx.gz" ) || fileName.endsWith( ".xls" ) || fileName.endsWith( ".xls.gz" ))
goodFile++;
}
if(goodFile==0){
throw new RuntimeException("No Excel sheet found.");
}


}


}
12 changes: 12 additions & 0 deletions plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/source/Qfs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@
import java.util.StringJoiner;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.calcite.linq4j.AbstractEnumerable;
import org.apache.calcite.linq4j.Enumerator;
import org.polypheny.db.adapter.Adapter.AdapterProperties;
import org.polypheny.db.adapter.Adapter.AdapterSettingString;
import org.polypheny.db.adapter.AdapterManager;
import org.polypheny.db.adapter.DataSource;
import org.polypheny.db.adapter.DeployMode;
import org.polypheny.db.catalog.entity.CatalogColumnPlacement;
Expand Down Expand Up @@ -302,4 +305,13 @@ protected void registerInformationPage( String uniqueName ) {
}
}


@Override
public void testConnection(){

if(currentSchema.getConvention().getFileSchema().getRootDir()==null)
throw new RuntimeException("The specified QFS root dir does not exist!");

}

}
22 changes: 22 additions & 0 deletions ...monetdb-adapter/src/main/java/org/polypheny/db/adapter/monetdb/sources/MonetdbSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.polypheny.db.adapter.Adapter.AdapterSettingString;
import org.polypheny.db.adapter.DeployMode;
import org.polypheny.db.adapter.jdbc.connection.ConnectionFactory;
import org.polypheny.db.adapter.jdbc.connection.ConnectionHandler;
import org.polypheny.db.adapter.jdbc.connection.TransactionalConnectionFactory;
import org.polypheny.db.adapter.jdbc.sources.AbstractJdbcSource;
import org.polypheny.db.catalog.Adapter;
Expand All @@ -38,6 +39,9 @@
import org.polypheny.db.schema.Table;
import org.polypheny.db.sql.language.SqlDialect;
import org.polypheny.db.sql.language.dialect.MonetdbSqlDialect;
import org.polypheny.db.transaction.PUID;
import org.polypheny.db.transaction.PUID.Type;
import org.polypheny.db.transaction.PolyXid;


@Slf4j
Expand Down Expand Up @@ -133,4 +137,22 @@ protected boolean requiresSchema() {
return true;
}


@Override
public void testConnection(){

PolyXid randomXid = PolyXid.generateLocalTransactionIdentifier( PUID.randomPUID( Type.NODE ), PUID.randomPUID( Type.TRANSACTION ) );
ConnectionHandler connectionHandler = connectionFactory.getConnectionHandler(randomXid);

// Execute an Postgres query
String sql = "SELECT 1";

try {
connectionHandler.executeQuery( sql );
} catch ( SQLException e ) {
throw new RuntimeException( e );
}
}
}


22 changes: 21 additions & 1 deletion plugins/mysql-adapter/src/main/java/org/polypheny/db/adapter/jdbc/MysqlSourcePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.polypheny.db.adapter.Adapter.AdapterSettingList;
import org.polypheny.db.adapter.Adapter.AdapterSettingString;
import org.polypheny.db.adapter.DeployMode;
import org.polypheny.db.adapter.jdbc.connection.ConnectionHandler;
import org.polypheny.db.adapter.jdbc.sources.AbstractJdbcSource;
import org.polypheny.db.catalog.Adapter;
import org.polypheny.db.catalog.entity.CatalogColumnPlacement;
Expand All @@ -37,6 +38,9 @@
import org.polypheny.db.schema.Schema;
import org.polypheny.db.schema.Table;
import org.polypheny.db.sql.language.dialect.MysqlSqlDialect;
import org.polypheny.db.transaction.PUID;
import org.polypheny.db.transaction.PUID.Type;
import org.polypheny.db.transaction.PolyXid;

public class MysqlSourcePlugin extends Plugin {

Expand Down Expand Up @@ -135,6 +139,22 @@ protected boolean requiresSchema() {
return false;
}


@Override
public void testConnection(){

PolyXid randomXid = PolyXid.generateLocalTransactionIdentifier( PUID.randomPUID( Type.NODE ), PUID.randomPUID( Type.TRANSACTION ) );
ConnectionHandler connectionHandler = connectionFactory.getConnectionHandler(randomXid);

// Execute an Postgres query
String sql = "SELECT 1";

try {
connectionHandler.executeQuery( sql );
} catch ( SQLException e ) {
throw new RuntimeException( e );
}
}
}

}
}
20 changes: 20 additions & 0 deletions ...gres-adapter/src/main/java/org/polypheny/db/adapter/postgres/source/PostgresqlSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.polypheny.db.adapter.Adapter.AdapterSettingList;
import org.polypheny.db.adapter.Adapter.AdapterSettingString;
import org.polypheny.db.adapter.DeployMode;
import org.polypheny.db.adapter.jdbc.connection.ConnectionHandler;
import org.polypheny.db.adapter.jdbc.sources.AbstractJdbcSource;
import org.polypheny.db.catalog.Adapter;
import org.polypheny.db.catalog.entity.CatalogColumnPlacement;
Expand All @@ -35,6 +36,9 @@
import org.polypheny.db.schema.Schema;
import org.polypheny.db.schema.Table;
import org.polypheny.db.sql.language.dialect.PostgresqlSqlDialect;
import org.polypheny.db.transaction.PUID;
import org.polypheny.db.transaction.PUID.Type;
import org.polypheny.db.transaction.PolyXid;


@Slf4j
Expand Down Expand Up @@ -124,4 +128,20 @@ protected boolean requiresSchema() {
return true;
}

@Override
public void testConnection(){

PolyXid randomXid = PolyXid.generateLocalTransactionIdentifier( PUID.randomPUID( Type.NODE ), PUID.randomPUID( Type.TRANSACTION ) );
ConnectionHandler connectionHandler = connectionFactory.getConnectionHandler(randomXid);

// Execute an Postgres query
String sql = "SELECT 1";

try {
connectionHandler.executeQuery( sql );
} catch ( SQLException e ) {
throw new RuntimeException( e );
}
}

}