Skip to content

Conn refactor #34

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

Open
wants to merge 5 commits into
base: conn_refactor
Choose a base branch
from
Open

Conn refactor #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6e1ed0
Merge branch 'master' of github.com:arrahtec/osdq-core
arun-y Apr 8, 2017
bb2c1ab
Merge branch 'master' of github.com:arrahtec/osdq-core
arun-y Jun 4, 2017
69bc90a
Merge branch 'master' into conn_refactor
arun-y Jun 4, 2017
b0eec0a
Merge branch 'master' of github.com:arrahtec/osdq-core into conn_refa…
arun-y Jul 9, 2017
b1e9b1f
connection refactoring
arun-y Jul 9, 2017
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
12 changes: 6 additions & 6 deletions src/main/java/org/arrah/framework/analytics/MetadataMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import org.arrah.framework.ndtable.ReportTableModel;
import org.arrah.framework.rdbms.QueryBuilder;
import org.arrah.framework.rdbms.Rdbms_conn;
import org.arrah.framework.rdbms.Rdbms_NewConn;
import org.arrah.framework.util.StringCaseFormatUtil;
import org.simmetrics.metrics.JaroWinkler;

Expand Down Expand Up @@ -212,12 +212,12 @@ else if (datamatchCount < 9)

public Object[] getDataforCol(String table, String col) {
Object[] coldata = new Object[10];
QueryBuilder querybuilder = new QueryBuilder(Rdbms_conn.getHValue("Database_DSN"),
table, col, Rdbms_conn.getDBType());
QueryBuilder querybuilder = new QueryBuilder(Rdbms_NewConn.get().getHValue("Database_DSN"),
table, col, Rdbms_NewConn.get().getDBType());
String top_sel_query = querybuilder.top_query(true,"top_count", "10");
try {
Rdbms_conn.openConn();
ResultSet rs = Rdbms_conn.runQuery(top_sel_query);
Rdbms_NewConn.get().openConn();
ResultSet rs = Rdbms_NewConn.get().runQuery(top_sel_query);
int counter = 0;
while (rs.next() && counter < 10) {
//String top_val = rs.getString("top_count");
Expand All @@ -226,7 +226,7 @@ public Object[] getDataforCol(String table, String col) {
coldata[counter++] = top_val;
}
rs.close();
Rdbms_conn.closeConn();
Rdbms_NewConn.get().closeConn();
} catch (SQLException exp) {
System.out.println("Column fetch error:"+ exp.getLocalizedMessage());
return coldata;
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/org/arrah/framework/dataquality/QualityCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.arrah.framework.ndtable.ReportTableModel;
import org.arrah.framework.rdbms.JDBCRowset;
import org.arrah.framework.rdbms.Rdbms_conn;
import org.arrah.framework.rdbms.Rdbms_NewConn;
import org.arrah.framework.rdbms.SqlType;
import org.arrah.framework.util.StringCaseFormatUtil;

Expand Down Expand Up @@ -114,7 +114,7 @@ else if (options.charAt(0) == '0' && options.charAt(2) == '0') // case insensiti
Object obj = null;
Object[] objA = null;

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
objA = rows.getRow(i + 1);
obj=objA[matchI];
if (obj == null) {
Expand Down Expand Up @@ -189,7 +189,7 @@ else if (options.charAt(0) == '0' && options.charAt(2) == '0') // case insensiti
.println("\n WANING: Could not Parse Input String:"
+ newValue);
}
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 )
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 )
objA = rows.getRow(i + 1); // For Hive it already filled.

Object[] add_obj = new Object[objA.length + 1];
Expand Down Expand Up @@ -259,15 +259,15 @@ public ReportTableModel nullReplace(JDBCRowset rows, String col,
Object obj = null;
Object[] objA = null;

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
objA = rows.getRow(i + 1);
obj=objA[matchI];
} else { // RDBMS
obj = rows.getObject(i + 1, matchI + 1);
}
if (obj == null || "".equals(obj.toString())) {
try {
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
objA = rows.getRow(i + 1);
}
Object[] add_obj = new Object[objA.length + 1];
Expand Down Expand Up @@ -318,7 +318,7 @@ public ReportTableModel patternMatch(JDBCRowset rows, String col,
Object obj = null;
Object[] objA = null;

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
objA = rows.getRow(i + 1);
obj=objA[matchI];
if (obj == null) {
Expand Down Expand Up @@ -353,7 +353,7 @@ public ReportTableModel patternMatch(JDBCRowset rows, String col,
}
if (isObjMatch == true) {
try {
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
objA = rows.getRow(i + 1);
}
Object[] add_obj = new Object[objA.length + 1];
Expand Down Expand Up @@ -409,7 +409,7 @@ public ReportTableModel caseFormat(JDBCRowset rows, String col,
Object obj = null;
Object[] objA = null;

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
objA = rows.getRow(i + 1);
obj=objA[matchI];
if (obj == null) {
Expand Down Expand Up @@ -461,7 +461,7 @@ public ReportTableModel caseFormat(JDBCRowset rows, String col,
if (isObjMatch == false) {
try {
String value = valueFormat;
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
objA = rows.getRow(i + 1); // Already selected for Hive
}
Object[] add_obj = new Object[objA.length + 1];
Expand Down Expand Up @@ -520,7 +520,7 @@ public ReportTableModel discreetSearch(JDBCRowset rows, String col,
Object obj = null;
Object[] objA = null;

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
objA = rows.getRow(i + 1);
obj=objA[matchI];
if (obj == null) {
Expand Down Expand Up @@ -565,7 +565,7 @@ public ReportTableModel discreetSearch(JDBCRowset rows, String col,
.println("\n WANING: Could not Parse Input String:"
+ newValue);
}
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
objA = rows.getRow(i + 1);
}
Object[] add_obj = new Object[objA.length + 1];
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/arrah/framework/dataquality/SimilarityCheckLucene.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.apache.lucene.store.RAMDirectory;
import org.arrah.framework.ndtable.ReportTableModel;
import org.arrah.framework.rdbms.JDBCRowset;
import org.arrah.framework.rdbms.Rdbms_conn;
import org.arrah.framework.rdbms.Rdbms_NewConn;


public class SimilarityCheckLucene {
Expand Down Expand Up @@ -280,7 +280,7 @@ public void searchTableIndex(String query) {
row = _rt.getRow(Integer.parseInt(rowid));
else {

if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
row = _rows.getRow(Integer.parseInt(rowid));
} else {
// will not work for Hive as rowset can not move bothway
Expand Down Expand Up @@ -394,7 +394,7 @@ public Object[][] searchTableObject(String fuzzyQ) {
/*** Not needed

if (isRowSet == true) { // Only if this is rowset
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") == 0 ) {
// for Hive
if (_rows != null) _rows.close();
try {
Expand Down Expand Up @@ -424,7 +424,7 @@ public Object[][] searchTableObject(String fuzzyQ) {
if (isRowSet == false)
row = _rt.getRow(Integer.parseInt(rowid));
else {
if (Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
if (Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("hive") != 0 ) {
row = _rows.getRow(Integer.parseInt(rowid));
} else {
// will not work for Hive as rowset can not move bothways
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/arrah/framework/hadooputil/HiveQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Vector;

import org.arrah.framework.rdbms.QueryBuilder;
import org.arrah.framework.rdbms.Rdbms_conn;
import org.arrah.framework.rdbms.Rdbms_NewConn;


public class HiveQueryBuilder extends QueryBuilder {
Expand Down Expand Up @@ -118,7 +118,7 @@ public String createRDBMSTable(String colDesc,String tbName,String constraintDes
s1C = s1C.replace(";",","); // (Col1;Col2) (Col1,Col2)
// for Informix CONSTRAINT KEY WORD IS not needed for primary key and the
// options in GUI
if(Rdbms_conn.getHValue("Database_Type").compareToIgnoreCase("Informix") == 0 ){
if(Rdbms_NewConn.get().getHValue("Database_Type").compareToIgnoreCase("Informix") == 0 ){
if (strrC == null || "".equals(strrC))
strrC = s1C;
else
Expand Down Expand Up @@ -225,7 +225,7 @@ public String get_hiveequal_query(Vector<?> col_vc, Vector<Integer> vc_t ,Vector
&& _dtype.compareToIgnoreCase("ms_access_jdbc") != 0
&& _dtype.compareToIgnoreCase("informix") != 0
&& !(_dtype.compareToIgnoreCase("Others") == 0 &&
Rdbms_conn.getHValue("Database_SupportQuote").compareToIgnoreCase("NO") ==0 ))
Rdbms_NewConn.get().getHValue("Database_SupportQuote").compareToIgnoreCase("NO") ==0 ))
{
if (!column.startsWith("\""))
column = "\"" + column + "\"";
Expand Down
27 changes: 13 additions & 14 deletions src/main/java/org/arrah/framework/ndtable/ResultsetToRTM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

import org.arrah.framework.rdbms.QueryBuilder;
import org.arrah.framework.rdbms.Rdbms_NewConn;
import org.arrah.framework.rdbms.Rdbms_conn;

public class ResultsetToRTM {

Expand Down Expand Up @@ -369,32 +368,32 @@ synchronized public static ReportTableModel compareTable(String lTable, Hashtabl
boolean match) throws SQLException {

ReportTableModel rtm = null;
Vector<?> avector[] = Rdbms_conn.populateColumn(lTable,null);
Vector<?> avector[] = Rdbms_NewConn.get().populateColumn(lTable,null);
QueryBuilder qb = new QueryBuilder(
Rdbms_conn.getHValue("Database_DSN"), lTable,
Rdbms_conn.getDBType());
Rdbms_NewConn.get().getHValue("Database_DSN"), lTable,
Rdbms_NewConn.get().getDBType());
String s1 = qb.get_selCol_query(avector[0].toArray(),"");

Rdbms_conn.openConn();
ResultSet resultset = Rdbms_conn.runQuery(s1);
Rdbms_NewConn.get().openConn();
ResultSet resultset = Rdbms_NewConn.get().runQuery(s1);
Vector<BigInteger> hashNumber = ResultsetToRTM.getMD5Value(resultset);
resultset.close();
Rdbms_conn.closeConn();
Rdbms_NewConn.get().closeConn();

// Query to another table

Rdbms_NewConn newConn = new Rdbms_NewConn(newDBParam);
Rdbms_NewConn.init(newDBParam);
qb = new QueryBuilder(
newConn.getHValue("Database_DSN"), rtable,
newConn.getDBType());
Vector<?> avectorR[] = newConn.populateColumn(rtable,null);
Rdbms_NewConn.get().getHValue("Database_DSN"), rtable,
Rdbms_NewConn.get().getDBType());
Vector<?> avectorR[] = Rdbms_NewConn.get().populateColumn(rtable,null);
s1 = qb.get_selCol_query(avectorR[0].toArray(),"");

if ( newConn.openConn() == true ) {
ResultSet resultset_new = newConn.runQuery(s1);
if (Rdbms_NewConn.get().openConn()) {
ResultSet resultset_new = Rdbms_NewConn.get().runQuery(s1);
rtm = ResultsetToRTM.matchMD5Value(resultset_new,hashNumber,match);
resultset_new.close();
newConn.closeConn();
Rdbms_NewConn.get().closeConn();

}
return rtm;
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/org/arrah/framework/profile/AllTableProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import org.arrah.framework.ndtable.ReportTableModel;
import org.arrah.framework.rdbms.QueryBuilder;
import org.arrah.framework.rdbms.Rdbms_conn;
import org.arrah.framework.rdbms.Rdbms_NewConn;

public class AllTableProfile {
private ReportTableModel __rt = new ReportTableModel(new String[] {
Expand All @@ -46,16 +46,16 @@ private void createRows() throws SQLException {
Vector<String> vc = new Vector<String>(); // For table

// Open the connection
Rdbms_conn.openConn();
DatabaseMetaData dbmd = Rdbms_conn.getMetaData();
Rdbms_NewConn.get().openConn();
DatabaseMetaData dbmd = Rdbms_NewConn.get().getMetaData();

// Get the metaDataSet
String s_pattern = Rdbms_conn.getHValue("Database_SchemaPattern");
String t_pattern = Rdbms_conn.getHValue("Database_TablePattern");
String t_type = Rdbms_conn.getHValue("Database_TableType");
String n_catalog = Rdbms_conn.getHValue("Database_Catalog");
String s_pattern = Rdbms_NewConn.get().getHValue("Database_SchemaPattern");
String t_pattern = Rdbms_NewConn.get().getHValue("Database_TablePattern");
String t_type = Rdbms_NewConn.get().getHValue("Database_TableType");
String n_catalog = Rdbms_NewConn.get().getHValue("Database_Catalog");
n_catalog = ""; // Oracle ODBC does not support
String d_dsn = Rdbms_conn.getHValue("Database_DSN");
String d_dsn = Rdbms_NewConn.get().getHValue("Database_DSN");

// Add table names here
// TODO - need to make it multi threaded
Expand All @@ -74,7 +74,7 @@ private void createRows() throws SQLException {
} // MS SQL Does not support multiple query
rs.close();
// Add count to top
String dbType = Rdbms_conn.getDBType();
String dbType = Rdbms_NewConn.get().getDBType();

ResultSet rs_col;
Vector<String> vc_c;
Expand Down Expand Up @@ -114,7 +114,7 @@ private void createRows() throws SQLException {
pattern_c = c_prof.get_pattern_query();

try {
rs_col = Rdbms_conn.runQuery(all_c);
rs_col = Rdbms_NewConn.get().runQuery(all_c);
while (rs_col.next()) {
all_v = rs_col.getString("row_count");
}
Expand All @@ -124,7 +124,7 @@ private void createRows() throws SQLException {
}

try {
rs_col = Rdbms_conn.runQuery(dist_c);
rs_col = Rdbms_NewConn.get().runQuery(dist_c);
while (rs_col.next()) {
dist_v = rs_col.getString("row_count");
}
Expand All @@ -133,7 +133,7 @@ private void createRows() throws SQLException {
dist_v = "N/A";
}
try {
rs_col = Rdbms_conn.runQuery(null_c);
rs_col = Rdbms_NewConn.get().runQuery(null_c);
while (rs_col.next()) {
null_v = rs_col.getString("equal_count");
}
Expand All @@ -142,7 +142,7 @@ private void createRows() throws SQLException {
null_v = "N/A";
}
try {
rs_col = Rdbms_conn.runQuery(zero_c);
rs_col = Rdbms_NewConn.get().runQuery(zero_c);
while (rs_col.next()) {
zero_v = rs_col.getString("equal_count");
}
Expand All @@ -151,7 +151,7 @@ private void createRows() throws SQLException {
zero_v = "N/A";
}
try {
rs_col = Rdbms_conn.runQuery(empty_c);
rs_col = Rdbms_NewConn.get().runQuery(empty_c);
while (rs_col.next()) {
empty_v = rs_col.getString("equal_count");
}
Expand All @@ -160,7 +160,7 @@ private void createRows() throws SQLException {
empty_v = "N/A";
}
try {
rs_col = Rdbms_conn.runQuery(pattern_c);
rs_col = Rdbms_NewConn.get().runQuery(pattern_c);
while (rs_col.next()) {
pattern_v = rs_col.getString("row_count");
}
Expand All @@ -174,7 +174,7 @@ private void createRows() throws SQLException {
__rt.addFillRow(row);
} // Close column
} // Close table
Rdbms_conn.closeConn();
Rdbms_NewConn.get().closeConn();
}

public ReportTableModel getTable() {
Expand Down
Loading