API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 4th, 2015
80
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.11 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/JDBC1DriverLoader.java b/JDBC1DriverLoader.java
  2. index 4ccc8f1..31969db 100644
  3. --- a/JDBC1DriverLoader.java
  4. +++ b/JDBC1DriverLoader.java
  5. @@ -9,7 +9,7 @@
  6. * Author: Atri Sharma <atri.jiit@gmail.com>
  7. *
  8. * IDENTIFICATION
  9. - * jdbc_fdw/JDBCDriverLoader.java
  10. + * jdbc_fdw/JDBC1DriverLoader.java
  11. *
  12. *-------------------------------------------------------------------------
  13. */
  14. @@ -19,15 +19,15 @@ import java.net.URL;
  15. import java.net.URLClassLoader;
  16. import java.net.MalformedURLException;
  17.  
  18. -public class JDBCDriverLoader extends URLClassLoader
  19. +public class JDBC1DriverLoader extends URLClassLoader
  20. {
  21.  
  22. /*
  23. - * JDBCDriverLoader
  24. - * Constructor of JDBCDriverLoader class.
  25. + * JDBC1DriverLoader
  26. + * Constructor of JDBC1DriverLoader class.
  27. */
  28. public
  29. - JDBCDriverLoader(URL[] path)
  30. + JDBC1DriverLoader(URL[] path)
  31. {
  32. super(path);
  33. }
  34. diff --git a/JDBC1Utils.java b/JDBC1Utils.java
  35. index 31425f5..a393124 100644
  36. --- a/JDBC1Utils.java
  37. +++ b/JDBC1Utils.java
  38. @@ -9,7 +9,7 @@
  39. * Author: Atri Sharma <atri.jiit@gmail.com>
  40. *
  41. * IDENTIFICATION
  42. - * jdbc_fdw/JDBCUtils.java
  43. + * jdbc_fdw/JDBC1Utils.java
  44. *
  45. *-------------------------------------------------------------------------
  46. */
  47. @@ -21,7 +21,7 @@ import java.net.URL;
  48. import java.net.URLClassLoader;
  49. import java.net.MalformedURLException;
  50. import java.util.*;
  51. -public class JDBCUtils
  52. +public class JDBC1Utils
  53. {
  54. private ResultSet result_set;
  55. private Connection conn;
  56. @@ -29,7 +29,7 @@ public class JDBCUtils
  57. private int NumberOfRows;
  58. private Statement sql;
  59. private String[] Iterate;
  60. - private static JDBCDriverLoader JDBC_Driver_Loader;
  61. + private static JDBC1DriverLoader JDBC_Driver_Loader;
  62. private StringWriter exception_stack_trace_string_writer;
  63. private PrintWriter exception_stack_trace_print_writer;
  64.  
  65. @@ -68,7 +68,7 @@ public class JDBCUtils
  66. {
  67. /* If JDBC_Driver_Loader is being
  68. * created. */
  69. - JDBC_Driver_Loader = new JDBCDriverLoader(new URL[]{JarFile.toURI().toURL()});
  70. + JDBC_Driver_Loader = new JDBC1DriverLoader(new URL[]{JarFile.toURI().toURL()});
  71. }
  72. else if (JDBC_Driver_Loader.CheckIfClassIsLoaded(DriverClassName) == null)
  73. {
  74. diff --git a/Makefile b/Makefile
  75. index bab9846..c3d7249 100644
  76. --- a/Makefile
  77. +++ b/Makefile
  78. @@ -34,8 +34,8 @@ endif
  79. TRGTS = JAVAFILES
  80.  
  81. JAVA_SOURCES = \
  82. - JDBCUtils.java \
  83. - JDBCDriverLoader.java \
  84. + JDBC1Utils.java \
  85. + JDBC1DriverLoader.java \
  86.  
  87. PG_CPPFLAGS=-D'PKG_LIB_DIR=$(pkglibdir)'
  88.  
  89. diff --git a/jdbc_fdw.c b/jdbc_fdw.c
  90. index b79ba10..a4506f7 100644
  91. --- a/jdbc_fdw.c
  92. +++ b/jdbc_fdw.c
  93. @@ -186,18 +186,18 @@ SIGINTInterruptCheckProcess()
  94.  
  95. if (InterruptFlag == true)
  96. {
  97. - jclass JDBCUtilsClass;
  98. + jclass JDBC1UtilsClass;
  99. jmethodID id_cancel;
  100. jstring cancel_result = NULL;
  101. char *cancel_result_cstring = NULL;
  102.  
  103. - JDBCUtilsClass = (*env)->FindClass(env, "JDBCUtils");
  104. - if (JDBCUtilsClass == NULL)
  105. + JDBC1UtilsClass = (*env)->FindClass(env, "JDBC1Utils");
  106. + if (JDBC1UtilsClass == NULL)
  107. {
  108. - elog(ERROR, "JDBCUtilsClass is NULL");
  109. + elog(ERROR, "JDBC1UtilsClass is NULL");
  110. }
  111.  
  112. - id_cancel = (*env)->GetMethodID(env, JDBCUtilsClass, "Cancel", "()Ljava/lang/String;");
  113. + id_cancel = (*env)->GetMethodID(env, JDBC1UtilsClass, "Cancel", "()Ljava/lang/String;");
  114. if (id_cancel == NULL)
  115. {
  116. elog(ERROR, "id_cancel is NULL");
  117. @@ -780,7 +780,7 @@ jdbcBeginForeignScan(ForeignScanState *node, int eflags)
  118. int svr_maxheapsize = 0;
  119. jdbcFdwExecutionState *festate;
  120. char *query;
  121. - jclass JDBCUtilsClass;
  122. + jclass JDBC1UtilsClass;
  123. jclass JavaString;
  124. jstring StringArray[7];
  125. jstring initialize_result = NULL;
  126. @@ -830,19 +830,19 @@ jdbcBeginForeignScan(ForeignScanState *node, int eflags)
  127. festate->NumberOfRows = 0;
  128.  
  129. /* Connect to the server and execute the query */
  130. - JDBCUtilsClass = (*env)->FindClass(env, "JDBCUtils");
  131. - if (JDBCUtilsClass == NULL)
  132. + JDBC1UtilsClass = (*env)->FindClass(env, "JDBC1Utils");
  133. + if (JDBC1UtilsClass == NULL)
  134. {
  135. - elog(ERROR, "JDBCUtilsClass is NULL");
  136. + elog(ERROR, "JDBC1UtilsClass is NULL");
  137. }
  138.  
  139. - id_initialize = (*env)->GetMethodID(env, JDBCUtilsClass, "Initialize", "([Ljava/lang/String;)Ljava/lang/String;");
  140. + id_initialize = (*env)->GetMethodID(env, JDBC1UtilsClass, "Initialize", "([Ljava/lang/String;)Ljava/lang/String;");
  141. if (id_initialize == NULL)
  142. {
  143. elog(ERROR, "id_initialize is NULL");
  144. }
  145.  
  146. - id_numberofcolumns = (*env)->GetFieldID(env, JDBCUtilsClass, "NumberOfColumns" , "I");
  147. + id_numberofcolumns = (*env)->GetFieldID(env, JDBC1UtilsClass, "NumberOfColumns" , "I");
  148. if (id_numberofcolumns == NULL)
  149. {
  150. elog(ERROR, "id_numberofcolumns is NULL");
  151. @@ -885,7 +885,7 @@ jdbcBeginForeignScan(ForeignScanState *node, int eflags)
  152. (*env)->SetObjectArrayElement(env, arg_array, counter, StringArray[counter]);
  153. }
  154.  
  155. - java_call = (*env)->AllocObject(env, JDBCUtilsClass);
  156. + java_call = (*env)->AllocObject(env, JDBC1UtilsClass);
  157. if (java_call == NULL)
  158. {
  159. elog(ERROR, "java_call is NULL");
  160. @@ -924,7 +924,7 @@ jdbcIterateForeignScan(ForeignScanState *node)
  161. char **values;
  162. HeapTuple tuple;
  163. jmethodID id_returnresultset;
  164. - jclass JDBCUtilsClass;
  165. + jclass JDBC1UtilsClass;
  166. jobjectArray java_rowarray;
  167. int i = 0;
  168. int j = 0;
  169. @@ -945,13 +945,13 @@ jdbcIterateForeignScan(ForeignScanState *node)
  170. }
  171.  
  172.  
  173. - JDBCUtilsClass = (*env)->FindClass(env, "JDBCUtils");
  174. - if (JDBCUtilsClass == NULL)
  175. + JDBC1UtilsClass = (*env)->FindClass(env, "JDBC1Utils");
  176. + if (JDBC1UtilsClass == NULL)
  177. {
  178. - elog(ERROR, "JDBCUtilsClass is NULL");
  179. + elog(ERROR, "JDBC1UtilsClass is NULL");
  180. }
  181.  
  182. - id_returnresultset = (*env)->GetMethodID(env, JDBCUtilsClass, "ReturnResultSet", "()[Ljava/lang/String;");
  183. + id_returnresultset = (*env)->GetMethodID(env, JDBC1UtilsClass, "ReturnResultSet", "()[Ljava/lang/String;");
  184. if (id_returnresultset == NULL)
  185. {
  186. elog(ERROR, "id_returnresultset is NULL");
  187. @@ -996,7 +996,7 @@ static void
  188. jdbcEndForeignScan(ForeignScanState *node)
  189. {
  190. jmethodID id_close;
  191. - jclass JDBCUtilsClass;
  192. + jclass JDBC1UtilsClass;
  193. jstring close_result = NULL;
  194. char *close_result_cstring = NULL;
  195. jdbcFdwExecutionState *festate = (jdbcFdwExecutionState *) node->fdw_state;
  196. @@ -1004,13 +1004,13 @@ jdbcEndForeignScan(ForeignScanState *node)
  197.  
  198. SIGINTInterruptCheckProcess();
  199.  
  200. - JDBCUtilsClass = (*env)->FindClass(env, "JDBCUtils");
  201. - if (JDBCUtilsClass == NULL)
  202. + JDBC1UtilsClass = (*env)->FindClass(env, "JDBC1Utils");
  203. + if (JDBC1UtilsClass == NULL)
  204. {
  205. - elog(ERROR, "JDBCUtilsClass is NULL");
  206. + elog(ERROR, "JDBC1UtilsClass is NULL");
  207. }
  208.  
  209. - id_close = (*env)->GetMethodID(env, JDBCUtilsClass, "Close", "()Ljava/lang/String;");
  210. + id_close = (*env)->GetMethodID(env, JDBC1UtilsClass, "Close", "()Ljava/lang/String;");
  211. if (id_close == NULL)
  212. {
  213. elog(ERROR, "id_close is NULL");
  214. @@ -1076,7 +1076,7 @@ jdbcGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid, F
  215. scan_clauses = extract_actual_clauses(scan_clauses, false);
  216.  
  217. /* Create the ForeignScan node */
  218. - return (make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL));
  219. + return (make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL, NIL));
  220. }
  221.  
  222. /*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!