Changeset: 2a00ae496fb1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a00ae496fb1 Modified Files: java/ChangeLog java/build.xml java/src/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/nl/cwi/monetdb/jdbc/MonetStatement.java Branch: default Log Message:
jdbc: drop mil and xquery language support diffs (138 lines): diff --git a/java/ChangeLog b/java/ChangeLog --- a/java/ChangeLog +++ b/java/ChangeLog @@ -2,5 +2,6 @@ # This file is updated with Maddlog * Mon Feb 7 2011 Fabian Groffen <[email protected]> -- Removed XQuery related XRPC wrapper and XML:DB code +- Removed XQuery related XRPC wrapper and XML:DB code, removed support + for language=xquery and language=mil from JDBC. diff --git a/java/build.xml b/java/build.xml --- a/java/build.xml +++ b/java/build.xml @@ -235,13 +235,11 @@ <filter token="MCL_MAJOR" value="${MCL_MAJOR}" /> <filter token="MCL_MINOR" value="${MCL_MINOR}" /> <filter token="JDBC_DEF_PORT" value="${JDBC_DEF_PORT}" /> - <filter token="JDBC_DEF_PORT_XQUERY" value="${JDBC_DEF_PORT_XQUERY}" /> <filter token="JDBC_VER_SUFFIX" value="${JDBC_VER_SUFFIX} ${TODAY}" /> <fail unless="JDBC_MAJOR" message="'JDBC_MAJOR' undefined. Please follow the directions in build.properties."/> <fail unless="JDBC_MINOR" message="'JDBC_MINOR' undefined. Please follow the directions in build.properties."/> <fail unless="JDBC_DEF_PORT" message="'JDBC_DEF_PORT' undefined. Please follow the directions in build.properties."/> - <fail unless="JDBC_DEF_PORT_XQUERY" message="'JDBC_DEF_PORT_XQUERY' undefined. Please follow the directions in build.properties."/> <fail unless="JDBC_VER_SUFFIX" message="'JDBC_VER_SUFFIX' undefined. Please follow the directions in build.properties."/> <!-- now copy and filter the file --> diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java --- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java +++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java @@ -103,10 +103,6 @@ /** the SQL language */ final static int LANG_SQL = 0; - /** the XQuery language */ - final static int LANG_XQUERY = 1; - /** the MIL language (officially *NOT* supported) */ - final static int LANG_MIL = 2; /** the MAL language (officially *NOT* supported) */ final static int LANG_MAL = 3; /** an unknown language */ @@ -228,10 +224,6 @@ // language used if (language.startsWith("sql")) { lang = LANG_SQL; - } else if ("xquery".equals(language)) { - lang = LANG_XQUERY; - } else if ("mil".equals(language)) { - lang = LANG_MIL; } else if ("mal".equals(language)) { lang = LANG_MAL; } else { @@ -247,15 +239,7 @@ commandTempl[0] = "X"; // pre commandTempl[1] = null; // post commandTempl[2] = "\nX"; // separator - } else if (lang == LANG_XQUERY) { - queryTempl[0] = "s"; - queryTempl[1] = null; - queryTempl[2] = ","; - - commandTempl[0] = "X"; // pre - commandTempl[1] = null; // post - commandTempl[2] = "\nX"; // separator - } else if (lang == LANG_MIL || lang == LANG_MAL) { + } else if (lang == LANG_MAL) { queryTempl[0] = null; queryTempl[1] = ";\n"; queryTempl[2] = ";\n"; @@ -279,12 +263,6 @@ tz += (offset < 10 ? "0" : "") + offset; sendIndependantCommand("SET TIME ZONE INTERVAL '" + tz + "' HOUR TO MINUTE"); } - // the following initialisers are only valid when the language - // is XQUERY... - if (lang == LANG_XQUERY) { - // output format - sendControlCommand("output seq"); - } // we're absolutely not closed, since we're brand new closed = false; @@ -1056,9 +1034,7 @@ */ public String toString() { String language = ""; - if (lang == LANG_XQUERY) language = "?language=xquery"; - else if (lang == LANG_MIL) language = "?language=mil"; - else if (lang == LANG_MAL) language = "?language=mal"; + if (lang == LANG_MAL) language = "?language=mal"; return("MonetDB Connection (jdbc:monetdb://" + hostname + ":" + port + "/" + database + language + ") " + (closed ? "connected" : "disconnected")); diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in b/java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in --- a/java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in +++ b/java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in @@ -116,7 +116,7 @@ // set the optional properties and their defaults here props.put("port", PORT); props.put("debug", "false"); - props.put("language", "sql"); // mil, mal, sql, xquery, whatever + props.put("language", "sql"); // mal, sql, <future> props.put("java_prepared_statements", "false"); props.putAll(info); @@ -222,7 +222,7 @@ prop = new DriverPropertyInfo("language", "sql"); prop.required = false; - prop.description = "What language to use for MonetDB conversations (sql/xquery)"; + prop.description = "What language to use for MonetDB conversations (experts only)"; props.add(prop); prop = new DriverPropertyInfo("hash", ""); diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java b/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java --- a/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java +++ b/java/src/nl/cwi/monetdb/jdbc/MonetStatement.java @@ -191,19 +191,6 @@ // don't think long if there isn't much to do if (batch == null) return(new int[0]); - // go into special Xcopy mode with XQuery - if (((MonetConnection)connection).lang == MonetConnection.LANG_XQUERY) { - // concatenate all strings into one, and send them over - StringBuffer buf = new StringBuffer(8192); - for (int i = 0; i < batch.size(); i++) { - buf.append(batch.get(i)).append('\n'); - } - - ((MonetConnection)connection).copyToServer(buf.toString(), null); - // ignore the resonse for now, it's empty - return(new int[0]); - } - int[] counts = new int[batch.size()]; int offset = 0; boolean first = true; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
