Skip to content
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.

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

New database support: Timeplus Proton #139

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ For more info see [timestored.com/pulse](http://timestored.com/pulse "timestored
Pulse is an open source tool for real-time visual analysis, email reporting and alerting.
It allows you to create and share real-time interactive applications with your team.

Pulse supports 40+ databases including kdb, postgresql, mysql, ms sql, clickhouse.
Pulse supports 40+ databases including kdb, postgresql, mysql, ms sql, clickhouse, proton.
Databases that are wire compatible with postgres/mysql also work i.e. timescale, questdb, cockroachdb.


Expand Down
75,678 changes: 37,839 additions & 37,839 deletions client/package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion client/src/components/ConnectionsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ class ConnectionsEditor extends Component<EditorProps, ConnectionsEditorState> {

export function JdbcSelect(props: { jdbcTypeSelected?: string, onChange: (e: React.FormEvent<HTMLSelectElement>) => void }) {
// THis line was mostly generated in java (see JdbcTypesTest) then reorded to put KDB first.
const types = { "KDB": "Kdb","KDB_STREAMING": "Kdb_Streaming","MSSERVER": "Microsoft SQL Server","MYSQL": "MySQL","POSTGRES": "Postgres","REDIS": "Redis","APACHE_CALCITE_AVATICA": "Apache Calcite Avatica","APACHE_IGNITE": "Apache Ignite","APACHE_KYLIN": "Apache Kylin","KYUUBI_HIVE": "Apache Kyuubi","SPARK_HIVE": "Apache Spark","YANDEX_CLICKHOUSE": "ClickHouse (Yandex)","CLICKHOUSE_COM": "ClickHouse.com","CRATEDB": "CrateDB (Legacy)","CSVJDBC": "CSV","DB2_ISERIES": "Db2 for IBM i","DERBY": "Derby Embedded","DERBY_SERVER": "Derby Server","DOLPHINDB": "DolphinDB","DUCKDB": "DuckDB","ELASTICSEARCH": "Elasticsearch","GEMFIRE_XD": "Gemfire XD","H2": "H2","SAP_HANA": "HANA (Old)","HSQLDB_EMBEDDED": "HSQL Embedded","HSQLDB_SERVER": "HSQL Server","INFLUXDB": "InfluxDB","INFORMIX": "Informix","MONGODB": "MongoDB","MSACCESS_UCANACCESS": "MS Access (UCanAccess)","NEO4J": "Neo4j","NUODB": "NuoDB","OMNISCI": "OmniSci (formerly MapD)","ORACLE": "Oracle","PRESTO": "PrestoSQL","SNAPPYDATA": "SnappyData","SNOWFLAKE": "Snowflake","APACHE_SOLRJ": "Solr","SQLITE_JDBC": "SQLite","SQREAM": "SQream DB","TDENGINE": "TDengine","TERADATA": "Teradata","TRINO": "Trino", };
const types = { "KDB": "Kdb","KDB_STREAMING": "Kdb_Streaming","MSSERVER": "Microsoft SQL Server","MYSQL": "MySQL","POSTGRES": "Postgres","REDIS": "Redis","APACHE_CALCITE_AVATICA": "Apache Calcite Avatica","APACHE_IGNITE": "Apache Ignite","APACHE_KYLIN": "Apache Kylin","KYUUBI_HIVE": "Apache Kyuubi","SPARK_HIVE": "Apache Spark","YANDEX_CLICKHOUSE": "ClickHouse (Yandex)","CLICKHOUSE_COM": "ClickHouse.com","CRATEDB": "CrateDB (Legacy)","CSVJDBC": "CSV","DB2_ISERIES": "Db2 for IBM i","DERBY": "Derby Embedded","DERBY_SERVER": "Derby Server","DOLPHINDB": "DolphinDB","DUCKDB": "DuckDB","ELASTICSEARCH": "Elasticsearch","GEMFIRE_XD": "Gemfire XD","H2": "H2","SAP_HANA": "HANA (Old)","HSQLDB_EMBEDDED": "HSQL Embedded","HSQLDB_SERVER": "HSQL Server","INFLUXDB": "InfluxDB","INFORMIX": "Informix","MONGODB": "MongoDB","MSACCESS_UCANACCESS": "MS Access (UCanAccess)","NEO4J": "Neo4j","NUODB": "NuoDB","OMNISCI": "OmniSci (formerly MapD)","ORACLE": "Oracle","PRESTO": "PrestoSQL","SNAPPYDATA": "SnappyData","SNOWFLAKE": "Snowflake","APACHE_SOLRJ": "Solr","SQLITE_JDBC": "SQLite","SQREAM": "SQream DB","TDENGINE": "TDengine","TERADATA": "Teradata","TRINO": "Trino", "PROTON":"Timeplus Proton"};
return <>
<FormGroup label="Type:" labelFor="connType" inline>
<HTMLSelect onChangeCapture={props.onChange}>
Expand Down Expand Up @@ -366,6 +366,7 @@ export function ConnectionHelp(props: { addConn: (jc: jdbcConnection) => void })
<JdbcCoverPanel jdbcConn={jdbcConnection.POSTGRES} addConn={props.addConn} />
<JdbcCoverPanel jdbcConn={jdbcConnection.MYSQL} addConn={props.addConn} />
<JdbcCoverPanel jdbcConn={jdbcConnection.CLICKHOUSE} addConn={props.addConn} />
<JdbcCoverPanel jdbcConn={jdbcConnection.PROTON} addConn={props.addConn} />
</div>
<br style={{ clear: "left" }} />
</div></>
Expand Down Expand Up @@ -427,6 +428,7 @@ class jdbcConnection extends Enumify {
static TDENGINE = new jdbcConnection("TDENGINE", "TDengine", "jdbc:TAOS-RS://{host}:{port}/[{database}]", 6041);
static TERADATA = new jdbcConnection("TERADATA", "Teradata", "jdbc:teradata://{host}/DATABASE={database},DBS_PORT={port}", 1025);
static TRINO = new jdbcConnection("TRINO", "Trino", "jdbc:trino://{host}:{port}[/{database}]", 8080);
static PROTON = new jdbcConnection("PROTON", "Timeplus Proton", "jdbc:proton://{host}:{port}/{database}", 8123);

static _ = jdbcConnection.closeEnum();

Expand Down
1 change: 1 addition & 0 deletions client/src/dbsprites.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
.zu-cassandra { width: 64px; height: 64px; background: url(../public/img/db.png) -64px -64px;}
.zu-clickhouse { width: 64px; height: 64px; background: url(../public/img/db.png) -128px -0;}
.zu-clickhouse_com { width: 64px; height: 64px; background: url(../public/img/db.png) -128px -64px;}
.zu-proton { width: 64px; height: 64px; background: url(../public/img/db.png) -128px -64px;}
.zu-cockroach { width: 64px; height: 64px; background: url(../public/img/db.png) -0 -128px;}
.zu-cratedb { width: 64px; height: 64px; background: url(../public/img/db.png) -64px -128px;}
.zu-csvjdbc { width: 64px; height: 64px; background: url(../public/img/db.png) -128px -128px;}
Expand Down
2 changes: 1 addition & 1 deletion client/src/engine/ViewStrategy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class TestCase {
}

// THis line was generated in java (see JdbcTypesTest)
enum JdbcTypes { CLICKHOUSE,CUSTOM,KDB,KDB_STREAMING,MSSERVER,MYSQL,POSTGRES,REDIS,APACHE_CALCITE_AVATICA,APACHE_IGNITE,APACHE_KYLIN,KYUUBI_HIVE,SPARK_HIVE,YANDEX_CLICKHOUSE,CLICKHOUSE_COM,CRATEDB,CSVJDBC,DB2_ISERIES,DERBY,DERBY_SERVER,DOLPHINDB,DUCKDB,ELASTICSEARCH,GEMFIRE_XD,H2,SAP_HANA,HSQLDB_EMBEDDED,HSQLDB_SERVER,INFLUXDB,INFORMIX,MONGODB,MSACCESS_UCANACCESS,NEO4J,NUODB,OMNISCI,ORACLE,PRESTO,SNAPPYDATA,SNOWFLAKE,APACHE_SOLRJ,SQLITE_JDBC,SQREAM,TDENGINE,TERADATA,TRINO, }
enum JdbcTypes { CLICKHOUSE,CUSTOM,KDB,KDB_STREAMING,MSSERVER,MYSQL,POSTGRES,REDIS,APACHE_CALCITE_AVATICA,APACHE_IGNITE,APACHE_KYLIN,KYUUBI_HIVE,SPARK_HIVE,YANDEX_CLICKHOUSE,CLICKHOUSE_COM,CRATEDB,CSVJDBC,DB2_ISERIES,DERBY,DERBY_SERVER,DOLPHINDB,DUCKDB,ELASTICSEARCH,GEMFIRE_XD,H2,SAP_HANA,HSQLDB_EMBEDDED,HSQLDB_SERVER,INFLUXDB,INFORMIX,MONGODB,MSACCESS_UCANACCESS,NEO4J,NUODB,OMNISCI,ORACLE,PRESTO,SNAPPYDATA,SNOWFLAKE,APACHE_SOLRJ,SQLITE_JDBC,SQREAM,TDENGINE,TERADATA,TRINO,PROTON }

export class ExampleTestCases {

Expand Down
5 changes: 5 additions & 0 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5999,6 +5999,11 @@
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
"version" "1.0.0"

"fsevents@^2.3.2", "fsevents@~2.3.2":
"integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
"version" "2.3.2"

"function-bind@^1.1.1":
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
Expand Down
1 change: 1 addition & 0 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
implementation files('lib/mysql-connector-j-8.0.31.jar')
implementation files('lib/mssql-jdbc-11.2.0.jre8.jar')
implementation files('lib/redis-jdbc-driver-1.4.jar')
implementation("com.timeplus:proton-jdbc:0.4.0")

implementation files('lib/jqi-0.0.1-SNAPSHOT-all.jar')

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/com/sqldashboards/shared/JdbcTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public enum JdbcTypes {
},

POSTGRES("Postgres", "org.postgresql.Driver", 5432, "jdbc:postgresql://{host}:{port}/{database}?", "http://postgresql.com", "", ""),
CLICKHOUSE("Clickhouse", "ru.yandex.clickhouse.ClickHouseDriver", 8123, "jdbc:clickhouse://{host}:{port}/{database}", "http://clickhouse.com", "", ""),
CLICKHOUSE("Clickhouse", "ru.yandex.clickhouse.ClickHouseDriver", 8123, "jdbc:clickhouse://{host}:{port}/{database}", "http://clickhouse.com", "", ""),
PROTON("Proton", "com.timeplus.proton.jdbc.ProtonDriver", 8123, "jdbc:proton://{host}:{port}/{database}", "http://github.com/timeplus-io/proton", "", ""),

CUSTOM(getProperty("jdbc.niceName","Custom JDBC Driver"), getProperty("jdbc.driver","DriverNotSpecified"), getProperty("jdbc.port",5000), getProperty("jdbc.dbRequired", getProperty("jdbc.urlFormat","DriverUrlPrefixNotSpecified"))) {

Expand Down