Skip to content
This repository has been archived by the owner on Nov 20, 2019. It is now read-only.

Commit

Permalink
[CROSSDATA] [CONFIG] Paths for catalogs (#665)
Browse files Browse the repository at this point in the history 
* [CROSSDATA] [CONFIG] Catalogs paths renamed in conf files
  • Loading branch information
@mafernandez-stratio
mafernandez-stratio committed Sep 11, 2016
1 parent d51e8f0 commit a3246d1
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions core/src/main/resources/core-reference.conf
View file
Expand Up @@ -20,7 +20,7 @@ crossdata-core.launcher.sparkHome=${?crossdata_core_launcher_spark_home}
#JDBC parameters

####### Example JDBC MySQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.MySQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.MySQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.mariadb.jdbc.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:mysql://127.0.0.1:3306/"
#crossdata-core.catalog.jdbc.db.name = "crossdata"
Expand All @@ -30,7 +30,7 @@ crossdata-core.launcher.sparkHome=${?crossdata_core_launcher_spark_home}


####### PostgreSQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.PostgreSQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.PostgreSQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.postgresql.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:postgresql://127.0.0.1:5432/"
#crossdata-core.catalog.jdbc.db.user = "postgres"
Expand All @@ -39,7 +39,7 @@ crossdata-core.launcher.sparkHome=${?crossdata_core_launcher_spark_home}


####### Zookeeper Catalog Configuration ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.ZookeeperCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.ZookeeperCatalog"
#crossdata-core.catalog.zookeeper.connectionString = "localhost:2181"
#crossdata-core.catalog.zookeeper.connectionTimeout = 15000
#crossdata-core.catalog.zookeeper.sessionTimeout = 60000
Expand Down Expand Up @@ -72,7 +72,7 @@ crossdata-core.jars.externalJars = ${?crossdata_hdfs_externaljars}
################################################################################

//####### StreamingCatalog ###########
//crossdata-core.streaming.catalog.class="org.apache.spark.sql.crossdata.catalog.ZookeeperStreamingCatalog"
//crossdata-core.streaming.catalog.class = "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
//crossdata-core.streaming.catalog.zookeeper.connectionString = "localhost:2181"
//crossdata-core.streaming.catalog.zookeeper.connectionTimeout = 15000
//crossdata-core.streaming.catalog.zookeeper.sessionTimeout = 60000
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/resources/catalogspec/mysql-catalog-test-properties.conf
View file
@@ -1,10 +1,10 @@
##########################################
# #
# MySQL Catalog Options #
# MySQL Catalog Options #
# #
##########################################

crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.MySQLCatalog"
crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.MySQLXDCatalog"
crossdata-core.catalog.jdbc.driver = "org.mariadb.jdbc.Driver"
crossdata-core.catalog.jdbc.url = "jdbc:mysql://127.0.0.1:3306/"
crossdata-core.catalog.jdbc.db.name = "crossdata"
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/catalogspec/postgresql-catalog-test-properties.conf
View file
Expand Up @@ -5,7 +5,7 @@
##########################################


crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.PostgreSQLCatalog"
crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.PostgreSQLXDCatalog"
crossdata-core.catalog.jdbc.driver = "org.postgresql.Driver"
crossdata-core.catalog.jdbc.url = "jdbc:postgresql://127.0.0.1:5432/"
crossdata-core.catalog.jdbc.db.user = "postgres"
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/catalogspec/zookeeper-catalog-test-properties.conf
View file
Expand Up @@ -5,7 +5,7 @@
##########################################


crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.ZookeeperCatalog"
crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.ZookeeperCatalog"
crossdata-core.catalog.zookeeper.connectionString = "localhost:2181"
crossdata-core.catalog.zookeeper.connectionTimeout = 15000
crossdata-core.catalog.zookeeper.sessionTimeout = 60000
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/catalogspec/zookeeper-streaming-catalog-with-prefix.conf
View file
Expand Up @@ -4,7 +4,7 @@
# #
##########################################

crossdata-core.streaming.catalog.class= "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.class = "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.zookeeper.connectionString = "localhost:2181"
crossdata-core.streaming.catalog.zookeeper.connectionTimeout = 15000
crossdata-core.streaming.catalog.zookeeper.sessionTimeout = 60000
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/catalogspec/zookeeper-streaming-catalog-without-prefix.conf
View file
Expand Up @@ -4,7 +4,7 @@
# #
##########################################

crossdata-core.streaming.catalog.class= "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.class = "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.zookeeper.connectionString = "localhost:2181"
crossdata-core.streaming.catalog.zookeeper.connectionTimeout = 15000
crossdata-core.streaming.catalog.zookeeper.sessionTimeout = 60000
Expand Down
8 changes: 4 additions & 4 deletions core/src/test/resources/core-reference.conf
View file
Expand Up @@ -12,7 +12,7 @@ crossdata-core.external.config.filename = ${?crossdata_core_external_config_file
#JDBC parameters

####### Example JDBC MySQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.MySQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.MySQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.mariadb.jdbc.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:mysql://127.0.0.1:3306/"
#crossdata-core.catalog.jdbc.db.name = "crossdata"
Expand All @@ -22,15 +22,15 @@ crossdata-core.external.config.filename = ${?crossdata_core_external_config_file


####### PostgreSQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.PostgreSQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.PostgreSQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.postgresql.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:postgresql://127.0.0.1:5432/"
#crossdata-core.catalog.jdbc.db.user = "postgres"
#crossdata-core.catalog.jdbc.db.pass = "postgres"
#crossdata-core.catalog.prefix = "crossdataCluster"

####### Zookeeper Catalog Configuration ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.ZookeeperCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.ZookeeperCatalog"
#crossdata-core.catalog.zookeeper.connectionString = "localhost:2181"
#crossdata-core.catalog.zookeeper.connectionTimeout = 15000
#crossdata-core.catalog.zookeeper.sessionTimeout = 60000
Expand All @@ -47,7 +47,7 @@ crossdata-core.external.config.filename = ${?crossdata_core_external_config_file
#####################################

####### StreamingCatalog ###########
crossdata-core.streaming.catalog.class= "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.class = "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
crossdata-core.streaming.catalog.zookeeper.connectionString = "localhost:2181"
crossdata-core.streaming.catalog.zookeeper.connectionTimeout = 15000
crossdata-core.streaming.catalog.zookeeper.sessionTimeout = 60000
Expand Down
8 changes: 4 additions & 4 deletions dist/src/main/resources/server/core-application.conf
View file
Expand Up @@ -19,7 +19,7 @@ crossdata-core.external.config.filename = "/etc/sds/crossdata/server/core-applic
#JDBC parameters

####### Example JDBC MySQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.MySQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.MySQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.mariadb.jdbc.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:mysql://127.0.0.1:3306/"
#crossdata-core.catalog.jdbc.db.name = "crossdata"
Expand All @@ -29,7 +29,7 @@ crossdata-core.external.config.filename = "/etc/sds/crossdata/server/core-applic


####### PostgreSQL ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.PostgreSQLCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.PostgreSQLXDCatalog"
#crossdata-core.catalog.jdbc.driver = "org.postgresql.Driver"
#crossdata-core.catalog.jdbc.url = "jdbc:postgresql://127.0.0.1:5432/"
#crossdata-core.catalog.jdbc.db.name = "crossdata"
Expand All @@ -39,7 +39,7 @@ crossdata-core.external.config.filename = "/etc/sds/crossdata/server/core-applic


####### Zookeeper Catalog Configuration ###########
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.ZookeeperCatalog"
#crossdata-core.catalog.class = "org.apache.spark.sql.crossdata.catalog.persistent.ZookeeperCatalog"
#crossdata-core.catalog.zookeeper.connectionString = "localhost:2181"
#crossdata-core.catalog.zookeeper.connectionTimeout = 15000
#crossdata-core.catalog.zookeeper.sessionTimeout = 60000
Expand Down Expand Up @@ -69,7 +69,7 @@ crossdata-core.jars.externalJars = "/var/sds/crossdata/externalJars"
################################################################################

//####### StreamingCatalog ###########
//crossdata-core.streaming.catalog.class="org.apache.spark.sql.crossdata.catalog.ZookeeperStreamingCatalog"
//crossdata-core.streaming.catalog.class = "org.apache.spark.sql.crossdata.catalog.streaming.ZookeeperStreamingCatalog"
//crossdata-core.streaming.catalog.zookeeper.connectionString = "localhost:2181"
//crossdata-core.streaming.catalog.zookeeper.connectionTimeout = 15000
//crossdata-core.streaming.catalog.zookeeper.sessionTimeout = 60000
Expand Down

0 comments on commit a3246d1

Please sign in to comment.