Changeset: 04fbf3655452 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/04fbf3655452
Modified Files:
tests/BugConcurrent_clients_SF_1504657.java
tests/BugConcurrent_sequences.java
tests/BugDatabaseMetaData_Bug_3356.java
tests/BugDecimalRound_Bug_3561.java
tests/BugExecuteUpdate_Bug_3350.java
tests/BugSetQueryTimeout_Bug_3357.java
tests/Test_Cautocommit.java
tests/Test_Cforkbomb.java
tests/Test_CisValid.java
tests/Test_Clargequery.java
tests/Test_Cmanycon.java
tests/Test_Creplysize.java
tests/Test_Csavepoints.java
tests/Test_Csendthread.java
tests/Test_Ctransaction.java
tests/Test_Dobjects.java
tests/Test_FetchSize.java
tests/Test_Int128.java
tests/Test_PSgeneratedkeys.java
tests/Test_PSgetObject.java
tests/Test_PSlargeamount.java
tests/Test_PSlargebatchval.java
tests/Test_PSlargeresponse.java
tests/Test_PSmanycon.java
tests/Test_PSmetadata.java
tests/Test_PSsomeamount.java
tests/Test_PSsqldata.java
tests/Test_PStimedate.java
tests/Test_PStimezone.java
tests/Test_PStypes.java
tests/Test_Rbooleans.java
tests/Test_Rmetadata.java
tests/Test_Rpositioning.java
tests/Test_Rsqldata.java
tests/Test_Rtimedate.java
tests/Test_Sbatching.java
tests/Test_Smoreresults.java
tests/Test_Wrapper.java
Branch: default
Log Message:
Disable Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); code
as it is not needed anymore for self registering JDBC drivers
diffs (truncated from 478 to 300 lines):
diff --git a/tests/BugConcurrent_clients_SF_1504657.java
b/tests/BugConcurrent_clients_SF_1504657.java
--- a/tests/BugConcurrent_clients_SF_1504657.java
+++ b/tests/BugConcurrent_clients_SF_1504657.java
@@ -13,7 +13,7 @@ public class BugConcurrent_clients_SF_15
Connection con1 = null, con2 = null, con3 = null;
Statement stmt1 = null, stmt2 = null, stmt3 = null;
ResultSet rs1 = null, rs2= null, rs3 = null;
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
con1 = DriverManager.getConnection(args[0]);
con2 = DriverManager.getConnection(args[0]);
con3 = DriverManager.getConnection(args[0]);
diff --git a/tests/BugConcurrent_sequences.java
b/tests/BugConcurrent_sequences.java
--- a/tests/BugConcurrent_sequences.java
+++ b/tests/BugConcurrent_sequences.java
@@ -13,7 +13,7 @@ public class BugConcurrent_sequences {
Connection con1 = null, con2 = null;
Statement stmt1 = null, stmt2 = null;
ResultSet rs1 = null, rs2 = null;
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
con1 = DriverManager.getConnection(args[0]);
con2 = DriverManager.getConnection(args[0]);
stmt1 = con1.createStatement();
diff --git a/tests/BugDatabaseMetaData_Bug_3356.java
b/tests/BugDatabaseMetaData_Bug_3356.java
--- a/tests/BugDatabaseMetaData_Bug_3356.java
+++ b/tests/BugDatabaseMetaData_Bug_3356.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class BugDatabaseMetaData_Bug_3356 {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
DatabaseMetaData dbmd = con.getMetaData();
ResultSet rs = dbmd.getColumns("", "sys", "_tables", "id");
diff --git a/tests/BugDecimalRound_Bug_3561.java
b/tests/BugDecimalRound_Bug_3561.java
--- a/tests/BugDecimalRound_Bug_3561.java
+++ b/tests/BugDecimalRound_Bug_3561.java
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
public class BugDecimalRound_Bug_3561 {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt1 = con.createStatement();
PreparedStatement st;
diff --git a/tests/BugExecuteUpdate_Bug_3350.java
b/tests/BugExecuteUpdate_Bug_3350.java
--- a/tests/BugExecuteUpdate_Bug_3350.java
+++ b/tests/BugExecuteUpdate_Bug_3350.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class BugExecuteUpdate_Bug_3350 {
public static void main(String[] args) throws Exception {
- // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
final Connection con = DriverManager.getConnection(args[0]);
con.setAutoCommit(false); // disable auto commit, so we
can roll back the transaction
diff --git a/tests/BugSetQueryTimeout_Bug_3357.java
b/tests/BugSetQueryTimeout_Bug_3357.java
--- a/tests/BugSetQueryTimeout_Bug_3357.java
+++ b/tests/BugSetQueryTimeout_Bug_3357.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class BugSetQueryTimeout_Bug_3357 {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement st = con.createStatement();
try {
diff --git a/tests/Test_Cautocommit.java b/tests/Test_Cautocommit.java
--- a/tests/Test_Cautocommit.java
+++ b/tests/Test_Cautocommit.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_Cautocommit {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con1 = DriverManager.getConnection(args[0]);
Connection con2 = DriverManager.getConnection(args[0]);
Statement stmt1 = con1.createStatement();
diff --git a/tests/Test_Cforkbomb.java b/tests/Test_Cforkbomb.java
--- a/tests/Test_Cforkbomb.java
+++ b/tests/Test_Cforkbomb.java
@@ -47,7 +47,7 @@ public class Test_Cforkbomb {
public static void main(String[] args) throws Exception {
Test_Cforkbomb.args = args;
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
// just DoS the server full throttle :)
int i;
diff --git a/tests/Test_CisValid.java b/tests/Test_CisValid.java
--- a/tests/Test_CisValid.java
+++ b/tests/Test_CisValid.java
@@ -14,7 +14,7 @@ public class Test_CisValid {
* The function Connection.isValid() should only return TRUE or FALSE.
It
* shall never alter the state of this connection */
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection conn = DriverManager.getConnection(args[0]);
Statement stmt = conn.createStatement();
diff --git a/tests/Test_Clargequery.java b/tests/Test_Clargequery.java
--- a/tests/Test_Clargequery.java
+++ b/tests/Test_Clargequery.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_Clargequery {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con1 = DriverManager.getConnection(args[0]);
Statement stmt1 = con1.createStatement();
ResultSet rs = null;
diff --git a/tests/Test_Cmanycon.java b/tests/Test_Cmanycon.java
--- a/tests/Test_Cmanycon.java
+++ b/tests/Test_Cmanycon.java
@@ -11,7 +11,7 @@ import java.util.*;
public class Test_Cmanycon {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
List cons = new ArrayList(100); // Connections go in here
try {
diff --git a/tests/Test_Creplysize.java b/tests/Test_Creplysize.java
--- a/tests/Test_Creplysize.java
+++ b/tests/Test_Creplysize.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_Creplysize {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con1 = DriverManager.getConnection(args[0]);
Statement stmt1 = con1.createStatement();
ResultSet rs = null;
diff --git a/tests/Test_Csavepoints.java b/tests/Test_Csavepoints.java
--- a/tests/Test_Csavepoints.java
+++ b/tests/Test_Csavepoints.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_Csavepoints {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
ResultSet rs = null;
diff --git a/tests/Test_Csendthread.java b/tests/Test_Csendthread.java
--- a/tests/Test_Csendthread.java
+++ b/tests/Test_Csendthread.java
@@ -10,8 +10,7 @@ import java.sql.*;
public class Test_Csendthread {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
-
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
System.out.println("0. active threads: " +
Thread.activeCount());
StringBuilder sb = new StringBuilder();
diff --git a/tests/Test_Ctransaction.java b/tests/Test_Ctransaction.java
--- a/tests/Test_Ctransaction.java
+++ b/tests/Test_Ctransaction.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_Ctransaction {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con1 = DriverManager.getConnection(args[0]);
Statement stmt1 = con1.createStatement();
//DatabaseMetaData dbmd = con.getMetaData();
diff --git a/tests/Test_Dobjects.java b/tests/Test_Dobjects.java
--- a/tests/Test_Dobjects.java
+++ b/tests/Test_Dobjects.java
@@ -26,7 +26,7 @@ public class Test_Dobjects {
}
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
PreparedStatement pstmt;
diff --git a/tests/Test_FetchSize.java b/tests/Test_FetchSize.java
--- a/tests/Test_FetchSize.java
+++ b/tests/Test_FetchSize.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_FetchSize {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
ResultSet rs = stmt.executeQuery("SELECT * FROM _tables");
diff --git a/tests/Test_Int128.java b/tests/Test_Int128.java
--- a/tests/Test_Int128.java
+++ b/tests/Test_Int128.java
@@ -18,7 +18,7 @@ import java.sql.Statement;
/* Test whether we can represent a full-size int128 as JDBC results */
public class Test_Int128 {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
BigInteger bi = new BigInteger(
"123456789012345678909876543210987654321");
diff --git a/tests/Test_PSgeneratedkeys.java b/tests/Test_PSgeneratedkeys.java
--- a/tests/Test_PSgeneratedkeys.java
+++ b/tests/Test_PSgeneratedkeys.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_PSgeneratedkeys {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
con.setAutoCommit(false);
// >> false: auto commit was just switched off
diff --git a/tests/Test_PSgetObject.java b/tests/Test_PSgetObject.java
--- a/tests/Test_PSgetObject.java
+++ b/tests/Test_PSgetObject.java
@@ -10,7 +10,7 @@ import java.sql.*;
public class Test_PSgetObject {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
final Connection con = DriverManager.getConnection(args[0]);
con.setAutoCommit(false);
// >> false: auto commit was just switched off
diff --git a/tests/Test_PSlargeamount.java b/tests/Test_PSlargeamount.java
--- a/tests/Test_PSlargeamount.java
+++ b/tests/Test_PSlargeamount.java
@@ -14,7 +14,7 @@ import java.util.*;
public class Test_PSlargeamount {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
PreparedStatement pstmt;
@@ -24,7 +24,7 @@ public class Test_PSlargeamount {
try {
System.out.println("1. Preparing and executing a unique
statement");
- for (int i = 0; i < 100000; i++) {
+ for (int i = 0; i < 50000; i++) {
pstmt = con.prepareStatement("select " + i + ",
" + i + " = ?");
pstmt.setInt(1, i);
ResultSet rs = pstmt.executeQuery();
diff --git a/tests/Test_PSlargebatchval.java b/tests/Test_PSlargebatchval.java
--- a/tests/Test_PSlargebatchval.java
+++ b/tests/Test_PSlargebatchval.java
@@ -12,7 +12,7 @@ import java.nio.charset.Charset;
public class Test_PSlargebatchval {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
PreparedStatement pstmt;
diff --git a/tests/Test_PSlargeresponse.java b/tests/Test_PSlargeresponse.java
--- a/tests/Test_PSlargeresponse.java
+++ b/tests/Test_PSlargeresponse.java
@@ -11,7 +11,7 @@ import java.util.*;
public class Test_PSlargeresponse {
public static void main(String[] args) throws Exception {
- Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ // Class.forName("nl.cwi.monetdb.jdbc.MonetDriver"); // not
needed anymore for self registering JDBC drivers
Connection con = DriverManager.getConnection(args[0]);
Statement stmt = con.createStatement();
PreparedStatement pstmt;
@@ -23,7 +23,10 @@ public class Test_PSlargeresponse {
try {
System.out.print("1. DatabaseMetadata environment
retrieval... ");
- System.out.println(dbmd.getURL());
+ if (args[0].startsWith(dbmd.getURL()))
+ System.out.println("oke");
+ else
+ System.out.println("not oke " + dbmd.getURL());
pstmt = con.prepareStatement("select * from columns");
System.out.print("2. empty call...");
diff --git a/tests/Test_PSmanycon.java b/tests/Test_PSmanycon.java
--- a/tests/Test_PSmanycon.java
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
