new:usr:#69:Accept DSSet ID to support multi-tenant implementations. (#…

…72)

DS Set is a group of data sources and their cubes and views. Typically in a
single tenant system there is only set and DSSets are not exposed to users
and admins. For multi-tenant systems allow connections to be created for a
particular DSSet. This argument is valid for DB Catalogs only and is optional.

catalog/src/main/java/com/qubole/quark/catalog/db/SchemaFactory.java

@@ -104,9 +104,18 @@ public QuarkFactoryResult create(Properties info) throws QuarkException {
       MeasureDAO measureDAO = dbi.onDemand(MeasureDAO.class);
       DimensionDAO dimensionDAO = dbi.onDemand(DimensionDAO.class);
 
-      List<DSSet> dsSets = dsSetDAO.findAll();
-      long dsSetId = dsSets.get(0).getId();
-      long defaultDataSourceId = dsSets.get(0).getDefaultDatasourceId();
+
+      DSSet dsSet;
+      if (info.containsKey("dsSetId")) {
+        dsSet = dsSetDAO.find(Integer.parseInt(info.getProperty("dsSetId")));
+      } else {
+        List<DSSet> dsSets = dsSetDAO.findAll();
+        dsSet = dsSets.get(0);
+      }
+
+      long dsSetId = dsSet.getId();
+      long defaultDataSourceId = dsSet.getDefaultDatasourceId();
+
       List<JdbcSource> jdbcSources = jdbcSourceDAO.findByDSSetId(dsSetId);
       List<QuboleDbSource> quboleDbSources = quboleDbSourceDAO.findByDSSetId(dsSetId);
 

catalog/src/main/java/com/qubole/quark/catalog/db/dao/DSSetDAO.java

@@ -18,6 +18,7 @@
 import com.qubole.quark.catalog.db.mapper.DSSetMapper;
 import com.qubole.quark.catalog.db.pojo.DSSet;
 
+import org.skife.jdbi.v2.sqlobject.Bind;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
 
@@ -30,4 +31,7 @@
 public interface DSSetDAO {
   @SqlQuery("select id, name, default_datasource_id from ds_sets")
   List<DSSet> findAll();
+
+  @SqlQuery("select id, name, default_datasource_id from ds_sets where id = :id")
+  DSSet find(@Bind("id") int id);
 }

fatjdbc/src/test/java/com/qubole/quark/fatjdbc/test/DSSetMetaDataTest.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015. Qubole Inc
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.qubole.quark.fatjdbc.test;
+
+import com.qubole.quark.fatjdbc.test.utility.MetaDataTest;
+import org.flywaydb.core.Flyway;
+import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class DSSetMetaDataTest extends MetaDataTest {
+  private static final Logger log = LoggerFactory.getLogger(DSSetMetaDataTest.class);
+
+  private static final String dbSchemaUrl = "jdbc:h2:mem:DsSetMetaDataTest;DB_CLOSE_DELAY=-1";
+  private static Connection dbConnection;
+  static {
+    h2Url = "jdbc:h2:mem:DataForDSSetMetaDataTest;DB_CLOSE_DELAY=-1";
+    props = new Properties();
+    props.put("url", dbSchemaUrl);
+    props.put("user", "sa");
+    props.put("password", "");
+    props.put("dsSetId", "10");
+  }
+
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+    MetaDataTest.setUpClass(h2Url);
+    Flyway flyway = new Flyway();
+    flyway.setDataSource(dbSchemaUrl, "sa", "");
+    flyway.migrate();
+
+    Properties connInfo = new Properties();
+    connInfo.setProperty("url", dbSchemaUrl);
+    connInfo.setProperty("user", "sa");
+    connInfo.setProperty("password", "");
+
+    dbConnection = DriverManager.getConnection(dbSchemaUrl, connInfo);
+
+    Statement stmt = dbConnection.createStatement();
+    String sql = "insert into ds_sets(id, name) values(10, 'ten'); " +
+            "insert into data_sources(name,type, url, ds_set_id, datasource_type) values "
+        + "('H2', 'H2', '" + h2Url + "', 10, 'JDBC'); insert into jdbc_sources (id, "
+        + "username, password) values(1, 'sa', '');" +
+        "update ds_sets set default_datasource_id = 1 where id = 10;";
+
+    stmt.execute(sql);
+    stmt.close();
+  }
+
+  protected String getConnectionUrl() {
+    return "jdbc:quark:fat:db:";
+  }
+}