diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /lang/java | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'lang/java')
335 files changed, 4285 insertions, 618 deletions
diff --git a/lang/java/doc/style.css b/lang/java/doc/style.css index d0f1f056..0aeaa97f 100644 --- a/lang/java/doc/style.css +++ b/lang/java/doc/style.css @@ -1,35 +1,474 @@ /* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF } - -/* Table colors */ -.TableHeadingColor { background: #CCCCFF } /* Dark mauve */ -.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */ -.TableRowColor { background: #FFFFFF } /* White */ - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } -.FrameHeadingFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } -.FrameItemFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif } - -/* Example of smaller, sans-serif font in frames */ -/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF;}/* Red */ -.NavBarCell1Rev { background-color:#00008B;}/* Light red */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} - -pre.code -{ - border: solid thin; - padding: 2px; - background-color: #ffffcc; +/* +Overall document style +*/ +body { + background-color:#ffffff; + color:#353833; + font-family:Arial, Helvetica, sans-serif; + font-size:76%; + margin:0; +} +a:link, a:visited { + text-decoration:none; + color:#4c6b87; +} +a:hover, a:focus { + text-decoration:none; + color:#bb7a2a; +} +a:active { + text-decoration:none; + color:#4c6b87; +} +a[name] { + color:#353833; +} +a[name]:hover { + text-decoration:none; + color:#353833; +} +pre { + font-size:1.3em; +} +h1 { + font-size:1.8em; +} +h2 { + font-size:1.5em; +} +h3 { + font-size:1.4em; +} +h4 { + font-size:1.3em; +} +h5 { + font-size:1.2em; +} +h6 { + font-size:1.1em; +} +ul { + list-style-type:disc; +} +code, tt { + font-size:1.2em; +} +dt code { + font-size:1.2em; +} +table tr td dt code { + font-size:1.2em; + vertical-align:top; +} +sup { + font-size:.6em; +} +/* +Document title and Copyright styles +*/ +.clear { + clear:both; + height:0px; + overflow:hidden; +} +.aboutLanguage { + float:right; + padding:0px 21px; + font-size:.8em; + z-index:200; + margin-top:-7px; +} +.legalCopy { + margin-left:.5em; +} +.bar a, .bar a:link, .bar a:visited, .bar a:active { + color:#FFFFFF; + text-decoration:none; +} +.bar a:hover, .bar a:focus { + color:#bb7a2a; +} +.tab { + background-color:#0066FF; + background-image:url(resources/titlebar.gif); + background-position:left top; + background-repeat:no-repeat; + color:#ffffff; + padding:8px; + width:5em; + font-weight:bold; +} +/* +Navigation bar styles +*/ +.bar { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + padding:.8em .5em .4em .8em; + height:auto;/*height:1.8em;*/ + font-size:1em; + margin:0; +} +.topNav { + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.bottomNav { + margin-top:10px; + background-image:url(resources/background.gif); + background-repeat:repeat-x; + color:#FFFFFF; + float:left; + padding:0; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; +} +.subNav { + background-color:#dee3e9; + border-bottom:1px solid #9eadc0; + float:left; + width:100%; + overflow:hidden; +} +.subNav div { + clear:left; + float:left; + padding:0 0 5px 6px; +} +ul.navList, ul.subNavList { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.navList li{ + list-style:none; + float:left; + padding:3px 6px; +} +ul.subNavList li{ + list-style:none; + float:left; + font-size:90%; +} +.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { + color:#FFFFFF; + text-decoration:none; +} +.topNav a:hover, .bottomNav a:hover { + text-decoration:none; + color:#bb7a2a; +} +.navBarCell1Rev { + background-image:url(resources/tab.gif); + background-color:#a88834; + color:#FFFFFF; + margin: auto 5px; + border:1px solid #c9aa44; +} +/* +Page header and footer styles +*/ +.header, .footer { + clear:both; + margin:0 20px; + padding:5px 0 0 0; +} +.indexHeader { + margin:10px; + position:relative; +} +.indexHeader h1 { + font-size:1.3em; +} +.title { + color:#2c4557; + margin:10px 0; +} +.subTitle { + margin:5px 0 0 0; +} +.header ul { + margin:0 0 25px 0; + padding:0; +} +.footer ul { + margin:20px 0 5px 0; +} +.header ul li, .footer ul li { + list-style:none; + font-size:1.2em; +} +/* +Heading styles +*/ +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList ul.blockList li.blockList h3 { + background-color:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + margin:0 0 6px -8px; + padding:2px 5px; +} +ul.blockList ul.blockList li.blockList h3 { + padding:0; + margin:15px 0; +} +ul.blockList li.blockList h2 { + padding:0px 0 20px 0; +} +/* +Page layout container styles +*/ +.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + clear:both; + padding:10px 20px; + position:relative; +} +.indexContainer { + margin:10px; + position:relative; + font-size:1.0em; +} +.indexContainer h2 { + font-size:1.1em; + padding:0 0 3px 0; +} +.indexContainer ul { + margin:0; + padding:0; +} +.indexContainer ul li { + list-style:none; +} +.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { + font-size:1.1em; + font-weight:bold; + margin:10px 0 0 0; + color:#4E4E4E; +} +.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { + margin:10px 0 10px 20px; +} +.serializedFormContainer dl.nameValue dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +.serializedFormContainer dl.nameValue dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* +List styles +*/ +ul.horizontal li { + display:inline; + font-size:0.9em; +} +ul.inheritance { + margin:0; + padding:0; +} +ul.inheritance li { + display:inline; + list-style:none; +} +ul.inheritance li ul.inheritance { + margin-left:15px; + padding-left:15px; + padding-top:1px; +} +ul.blockList, ul.blockListLast { + margin:10px 0 10px 0; + padding:0; +} +ul.blockList li.blockList, ul.blockListLast li.blockList { + list-style:none; + margin-bottom:25px; +} +ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { + padding:0px 20px 5px 10px; + border:1px solid #9eadc0; + background-color:#f9f9f9; +} +ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { + padding:0 0 5px 8px; + background-color:#ffffff; + border:1px solid #9eadc0; + border-top:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { + margin-left:0; + padding-left:0; + padding-bottom:15px; + border:none; + border-bottom:1px solid #9eadc0; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { + list-style:none; + border-bottom:none; + padding-bottom:0; +} +table tr td dl, table tr td dl dt, table tr td dl dd { + margin-top:0; + margin-bottom:1px; +} +/* +Table styles +*/ +.contentContainer table, .classUseContainer table, .constantValuesContainer table { + border-bottom:1px solid #9eadc0; + width:100%; +} +.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { + width:100%; +} +.contentContainer .description table, .contentContainer .details table { + border-bottom:none; +} +.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ + vertical-align:top; + padding-right:20px; +} +.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, +.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, +.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, +.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { + padding-right:3px; +} +.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:#FFFFFF; + font-weight:bold; + clear:none; + overflow:hidden; + padding:0px; + margin:0px; +} +caption a:link, caption a:hover, caption a:active, caption a:visited { + color:#FFFFFF; +} +.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { + white-space:nowrap; + padding-top:8px; + padding-left:8px; + display:block; + float:left; + background-image:url(resources/titlebar.gif); + height:18px; +} +.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { + width:10px; + background-image:url(resources/titlebar_end.gif); + background-repeat:no-repeat; + background-position:top right; + position:relative; + float:left; +} +ul.blockList ul.blockList li.blockList table { + margin:0 0 12px 0px; + width:100%; +} +.tableSubHeadingColor { + background-color: #EEEEFF; +} +.altColor { + background-color:#eeeeef; +} +.rowColor { + background-color:#ffffff; +} +.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { + text-align:left; + padding:3px 3px 3px 7px; +} +th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { + background:#dee3e9; + border-top:1px solid #9eadc0; + border-bottom:1px solid #9eadc0; + text-align:left; + padding:3px 3px 3px 7px; +} +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; +} +td.colFirst, th.colFirst { + border-left:1px solid #9eadc0; + white-space:nowrap; +} +td.colLast, th.colLast { + border-right:1px solid #9eadc0; +} +td.colOne, th.colOne { + border-right:1px solid #9eadc0; + border-left:1px solid #9eadc0; +} +table.overviewSummary { + padding:0px; + margin-left:0px; +} +table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, +table.overviewSummary td.colOne, table.overviewSummary th.colOne { + width:25%; + vertical-align:middle; +} +table.packageSummary td.colFirst, table.overviewSummary th.colFirst { + width:25%; + vertical-align:middle; +} +/* +Content styles +*/ +.description pre { + margin-top:0; +} +.deprecatedContent { + margin:0; + padding:10px 0; +} +.docSummary { + padding:0; +} +/* +Formatting effect styles +*/ +.sourceLineNo { + color:green; + padding:0 30px 0 0; +} +h1.hidden { + visibility:hidden; + overflow:hidden; + font-size:.9em; +} +.block { + display:block; + margin:3px 0 0 0; +} +.strong { + font-weight:bold; } diff --git a/lang/java/ext/com/sleepycat/persist/model/ClassEnhancerTask.java b/lang/java/ext/com/sleepycat/persist/model/ClassEnhancerTask.java index 3c4e2500..50ceb257 100644 --- a/lang/java/ext/com/sleepycat/persist/model/ClassEnhancerTask.java +++ b/lang/java/ext/com/sleepycat/persist/model/ClassEnhancerTask.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/libdb_java/db.i b/lang/java/libdb_java/db.i index 0199a167..75ecf080 100644 --- a/lang/java/libdb_java/db.i +++ b/lang/java/libdb_java/db.i @@ -18,6 +18,7 @@ typedef unsigned char u_int8_t; typedef long int32_t; +typedef long long db_off_t; typedef long long db_seq_t; typedef long long pid_t; #ifndef SWIGJAVA @@ -43,6 +44,7 @@ struct DbLsn; typedef struct DbLsn DB_LSN; struct DbMpoolFile; typedef struct DbMpoolFile DB_MPOOLFILE; struct DbSequence; typedef struct Db DB_SEQUENCE; struct DbSite; typedef struct DbSite DB_SITE; +struct DbStream; typedef struct DbStream DB_STREAM; struct DbTxn; typedef struct DbTxn DB_TXN; /* Methods that allocate new objects */ @@ -138,6 +140,24 @@ struct Db return ret; } + const char *get_blob_dir() { + const char *ret; + errno = self->get_blob_dir(self, &ret); + return ret; + } + + const char *get_blob_sub_dir() { + const char *ret; + errno = self->get_blob_sub_dir(self, &ret); + return ret; + } + + u_int32_t get_blob_threshold () { + u_int32_t ret = 0; + errno = self->get_blob_threshold(self, &ret); + return ret; + } + int_bool get_byteswapped() { int ret = 0; errno = self->get_byteswapped(self, &ret); @@ -282,9 +302,13 @@ struct Db return ret; } - DBT *get_partition_keys() { - DBT *ret = NULL; - errno = self->get_partition_keys(self, NULL, &ret); + /* __dbt_arr is used to differentiate from DBT * as a return value. */ + struct __dbt_arr get_partition_keys() { + struct __dbt_arr ret; + u_int32_t len; + errno = self->get_partition_keys(self, &len, &ret.arr_ptr); + ret.len = (int)len; + ret.len--; return ret; } @@ -383,8 +407,16 @@ struct Db return self->set_append_recno(self, db_append_recno_fcn); } + db_ret_t set_blob_dir(const char *dir) { + return self->set_blob_dir(self, dir); + } + + db_ret_t set_blob_threshold(u_int32_t bytes, u_int32_t flags) { + return self->set_blob_threshold(self, bytes, flags); + } + db_ret_t set_bt_compare( - int (*bt_compare_fcn)(DB *, const DBT *, const DBT *)) { + int (*bt_compare_fcn)(DB *, const DBT *, const DBT *, size_t *)) { return self->set_bt_compare(self, bt_compare_fcn); } @@ -417,7 +449,7 @@ struct Db } db_ret_t set_dup_compare( - int (*dup_compare_fcn)(DB *, const DBT *, const DBT *)) { + int (*dup_compare_fcn)(DB *, const DBT *, const DBT *, size_t *)) { return self->set_dup_compare(self, dup_compare_fcn); } @@ -457,7 +489,7 @@ struct Db } db_ret_t set_h_compare( - int (*h_compare_fcn)(DB *, const DBT *, const DBT *)) { + int (*h_compare_fcn)(DB *, const DBT *, const DBT *, size_t *)) { return self->set_h_compare(self, h_compare_fcn); } @@ -488,6 +520,33 @@ struct Db } #endif /* SWIGJAVA */ + int set_msgfile(const char *msgfile) { + int ret; + FILE *fmsg; + ret = 0; + fmsg = NULL; + self->get_msgfile(self, &fmsg); + if (fmsg != NULL && fmsg != stdout && fmsg != stderr) { + fclose(fmsg); + fmsg = NULL; + } + if (strcmp(msgfile, "") == 0 || msgfile == NULL) + self->set_msgfile(self, NULL); + else if (strcmp(msgfile, "stdout") == 0) + self->set_msgfile(self, stdout); + else if (strcmp(msgfile, "stderr") == 0) + self->set_msgfile(self, stderr); + else { + fmsg = fopen(msgfile, "a"); + if (fmsg != NULL) { + self->set_msgfile(self, fmsg); + } + else + ret = 1; + } + return ret; + } + db_ret_t set_pagesize(u_int32_t pagesize) { return self->set_pagesize(self, pagesize); } @@ -542,6 +601,10 @@ struct Db return statp; } + int stat_print(u_int32_t flags) { + return self->stat_print(self, flags); + } + JAVA_EXCEPT(DB_RETOK_STD, DB2JDBENV) db_ret_t sync(u_int32_t flags) { return self->sync(self, flags); @@ -601,6 +664,13 @@ struct Dbc return count; } + JAVA_EXCEPT_ERRNO(DB_RETOK_STD, DB2JDBENV) + DB_STREAM *db_stream(u_int32_t flags) { + DB_STREAM *dbsp = NULL; + errno = self->db_stream(self, &dbsp, flags); + return dbsp; + } + JAVA_EXCEPT(DB_RETOK_DBCDEL, DBC2JDBENV) int del(u_int32_t flags) { return self->del(self, flags); @@ -737,6 +807,18 @@ struct DbEnv } JAVA_EXCEPT_ERRNO(DB_RETOK_STD, JDBENV) + const char *get_blob_dir() { + const char *ret; + errno = self->get_blob_dir(self, &ret); + return ret; + } + + u_int32_t get_blob_threshold() { + u_int32_t ret; + errno = self->get_blob_threshold(self, &ret); + return ret; + } + const char **get_data_dirs() { const char **ret; errno = self->get_data_dirs(self, &ret); @@ -826,6 +908,14 @@ struct DbEnv } JAVA_EXCEPT(DB_RETOK_STD, JDBENV) + db_ret_t set_blob_dir(const char *dir) { + return self->set_blob_dir(self, dir); + } + + db_ret_t set_blob_threshold(u_int32_t bytes, u_int32_t flags) { + return self->set_blob_threshold(self, bytes, flags); + } + db_ret_t set_cachesize(jlong bytes, int ncache) { return self->set_cachesize(self, (u_int32_t)(bytes / GIGABYTE), @@ -904,6 +994,33 @@ struct DbEnv self->set_msgcall(self, db_msgcall_fcn); } + int set_msgfile(const char *msgfile) { + int ret; + FILE *fmsg; + ret = 0; + fmsg = NULL; + self->get_msgfile(self, &fmsg); + if (fmsg != NULL && fmsg != stdout && fmsg != stderr) { + fclose(fmsg); + fmsg = NULL; + } + if (strcmp(msgfile, "") == 0 || msgfile == NULL) + self->set_msgfile(self, NULL); + else if (strcmp(msgfile, "stdout") == 0) + self->set_msgfile(self, stdout); + else if (strcmp(msgfile, "stderr") == 0) + self->set_msgfile(self, stderr); + else { + fmsg = fopen(msgfile, "a"); + if (fmsg != NULL) { + self->set_msgfile(self, fmsg); + } + else + ret = 1; + } + return ret; + } + JAVA_EXCEPT(DB_RETOK_STD, JDBENV) db_ret_t set_paniccall(void (*db_panic_fcn)(DB_ENV *, int)) { return self->set_paniccall(self, db_panic_fcn); @@ -1043,6 +1160,10 @@ struct DbEnv return statp; } + int lock_stat_print(u_int32_t flags) { + return self->lock_stat_print(self, flags); + } + #ifndef SWIGJAVA /* For Java, this is defined in native code */ db_ret_t lock_vec(u_int32_t locker, u_int32_t flags, DB_LOCKREQ *list, @@ -1187,6 +1308,10 @@ struct DbEnv return sp; } + int log_stat_print(u_int32_t flags) { + return self->log_stat_print(self, flags); + } + int log_verify(const char *envhome, u_int32_t cachesz, const char *dbfile, const char *dbname, time_t stime, time_t etime, @@ -1289,6 +1414,10 @@ struct DbEnv return mp_stat; } + int memp_stat_print(u_int32_t flags) { + return self->memp_stat_print(self, flags); + } + DB_MPOOL_FSTAT **memp_fstat(u_int32_t flags) { DB_MPOOL_FSTAT **mp_fstat = NULL; errno = self->memp_stat(self, NULL, &mp_fstat, flags); @@ -1366,6 +1495,10 @@ struct DbEnv return statp; } + int mutex_stat_print(u_int32_t flags) { + return self->mutex_stat_print(self, flags); + } + /* Transaction functions */ u_int32_t get_tx_max() { u_int32_t ret; @@ -1385,6 +1518,10 @@ struct DbEnv return ret; } + int stat_print(u_int32_t flags) { + return self->stat_print(self, flags); + } + JAVA_EXCEPT(DB_RETOK_TXNAPPLIED, JDBENV) int txn_applied(DB_TXN_TOKEN *token, u_int32_t maxwait, u_int32_t flags) { return self->txn_applied(self, token, maxwait, flags); @@ -1429,6 +1566,10 @@ struct DbEnv return statp; } + int txn_stat_print(u_int32_t flags) { + return self->txn_stat_print(self, flags); + } + /* Replication functions */ jlong rep_get_limit() { u_int32_t gbytes, bytes; @@ -1496,6 +1637,10 @@ struct DbEnv return statp; } + int rep_stat_print(u_int32_t flags) { + return self->rep_stat_print(self, flags); + } + JAVA_EXCEPT(DB_RETOK_STD, JDBENV) db_ret_t rep_set_limit(jlong bytes) { return self->rep_set_limit(self, @@ -1533,6 +1678,11 @@ struct DbEnv return self->rep_set_transport(self, envid, send); } + db_ret_t rep_set_view(int (*rep_view_fcn)(DB_ENV *, + const char *, int *, u_int32_t)) { + return self->rep_set_view(self, rep_view_fcn); + } + /* Advanced replication functions. */ JAVA_EXCEPT_ERRNO(DB_RETOK_STD, JDBENV) u_int32_t rep_get_nsites() { @@ -1573,6 +1723,13 @@ struct DbEnv return ret; } + JAVA_EXCEPT_ERRNO(DB_RETOK_STD, JDBENV) + jlong repmgr_get_incoming_queue_max() { + u_int32_t gbytes = 0, bytes = 0; + errno = self->repmgr_get_incoming_queue_max(self, &gbytes, &bytes); + return (jlong)gbytes * GIGABYTE + bytes; + } + JAVA_EXCEPT_ERRNO(DB_RETOK_REPMGR_LOCALSITE, JDBENV) DB_SITE *repmgr_local_site() { DB_SITE *site = NULL; @@ -1585,6 +1742,13 @@ struct DbEnv return self->repmgr_set_ack_policy(self, policy); } + JAVA_EXCEPT(DB_RETOK_STD, JDBENV) + db_ret_t repmgr_set_incoming_queue_max(jlong bytes) { + return self->repmgr_set_incoming_queue_max(self, + (u_int32_t)(bytes / GIGABYTE), + (u_int32_t)(bytes % GIGABYTE)); + } + JAVA_EXCEPT_ERRNO(DB_RETOK_STD, JDBENV) DB_SITE *repmgr_site(const char *host, u_int port) { DB_SITE *site = NULL; @@ -1624,9 +1788,18 @@ struct DbEnv return statp; } + int repmgr_stat_print(u_int32_t flags) { + return self->repmgr_stat_print(self, flags); + } + u_int32_t get_backup_config(u_int32_t config_type) { u_int32_t ret; errno = self->get_backup_config(self, (DB_BACKUP_CONFIG)config_type, &ret); + if (errno == EINVAL) { + errno = 0; + ret = 0; + } + return ret; } @@ -1812,14 +1985,14 @@ struct DbSequence } JAVA_EXCEPT_ERRNO(DB_RETOK_STD, NULL) - db_seq_t get(DB_TXN *txnid, int32_t delta, u_int32_t flags) { + db_seq_t get(DB_TXN *txnid, u_int32_t delta, u_int32_t flags) { db_seq_t ret = 0; errno = self->get(self, txnid, delta, &ret, flags); return ret; } - int32_t get_cachesize() { - int32_t ret = 0; + u_int32_t get_cachesize() { + u_int32_t ret = 0; errno = self->get_cachesize(self, &ret); return ret; } @@ -1867,7 +2040,7 @@ struct DbSequence return self->remove(self, txnid, flags); } - db_ret_t set_cachesize(int32_t size) { + db_ret_t set_cachesize(u_int32_t size) { return self->set_cachesize(self, size); } @@ -1885,6 +2058,10 @@ struct DbSequence errno = self->stat(self, &ret, flags); return ret; } + + int stat_print(u_int32_t flags) { + return self->stat_print(self, flags); + } } }; @@ -1926,6 +2103,32 @@ struct DbSite } }; +struct DbStream +{ +%extend { + JAVA_EXCEPT(DB_RETOK_STD, NULL) + db_ret_t close(u_int32_t flags) { + return self->close(self, flags); + } + + int read(DBT *data, db_off_t offset, u_int32_t size, u_int32_t flags) { + return self->read(self, data, offset, size, flags); + } + + JAVA_EXCEPT_ERRNO(DB_RETOK_STD, NULL) + db_off_t size(u_int32_t flags) { + db_off_t ret = 0; + errno = self->size(self, &ret, flags); + return ret; + } + + JAVA_EXCEPT(DB_RETOK_STD, NULL) + int write(DBT *data, db_off_t offset, u_int32_t flags) { + return self->write(self, data, offset, flags); + } +} +}; + struct DbTxn { %extend { diff --git a/lang/java/libdb_java/db_java.i b/lang/java/libdb_java/db_java.i index f47029b0..1d380a0c 100644 --- a/lang/java/libdb_java/db_java.i +++ b/lang/java/libdb_java/db_java.i @@ -76,6 +76,7 @@ import java.util.Comparator; private String errpfx; private MessageHandler message_handler; private PanicHandler panic_handler; + private ReplicationViewHandler rep_view_handler; private ReplicationManagerMessageDispatch repmgr_msg_dispatch_handler; private ReplicationTransport rep_transport_handler; private java.io.OutputStream error_stream; @@ -133,6 +134,10 @@ import java.util.Comparator; event_notify_handler.handlePanicEvent(); } + private final void handle_rep_autotakeover_failed_event_notify() { + event_notify_handler.handleRepAutoTakeoverFailedEvent(); + } + private final void handle_rep_client_event_notify() { event_notify_handler.handleRepClientEvent(); } @@ -161,9 +166,13 @@ import java.util.Comparator; event_notify_handler.handleRepElectionFailedEvent(); } - private final void handle_rep_init_done_event_notify() { - event_notify_handler.handleRepInitDoneEvent(); - } + private final void handle_rep_init_done_event_notify() { + event_notify_handler.handleRepInitDoneEvent(); + } + + private final void handle_rep_inqueue_full_event_notify() { + event_notify_handler.handleRepInQueueFullEvent(); + } private final void handle_rep_join_failure_event_notify() { event_notify_handler.handleRepJoinFailureEvent(); @@ -281,6 +290,10 @@ import java.util.Comparator; return panic_handler; } + public final boolean handle_rep_view(String name, int flags) { + return rep_view_handler.partial_view(wrapper, name, flags); + } + private final int handle_rep_transport(DatabaseEntry control, DatabaseEntry rec, LogSequenceNumber lsn, @@ -726,6 +739,16 @@ import java.util.Comparator; } %} +%typemap(javacode) struct DbStream %{ + public synchronized void close(int flags) throws DatabaseException { + try { + close0(flags); + } finally { + swigCPtr = 0; + } + } +%} + %typemap(javacode) struct DbChannel %{ public synchronized void close(int flags) throws DatabaseException { try { diff --git a/lang/java/libdb_java/db_java_wrap.c b/lang/java/libdb_java/db_java_wrap.c index dcaac8e0..976a9d8d 100644 --- a/lang/java/libdb_java/db_java_wrap.c +++ b/lang/java/libdb_java/db_java_wrap.c @@ -1,12 +1,12 @@ #include "db_config.h" /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 - * - * This file is not intended to be easily readable and contains a number of + * Version 2.0.12 + * + * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make - * changes to this file unless you know what you are doing--modify the SWIG - * interface file instead. + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. * ----------------------------------------------------------------------------- */ #define SWIGJAVA @@ -42,28 +42,28 @@ #ifndef SWIGUNUSED # if defined(__GNUC__) # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else # define SWIGUNUSED # endif # elif defined(__ICC) -# define SWIGUNUSED __attribute__ ((__unused__)) +# define SWIGUNUSED __attribute__ ((__unused__)) # else -# define SWIGUNUSED +# define SWIGUNUSED # endif #endif #ifndef SWIG_MSC_UNSUPPRESS_4505 # if defined(_MSC_VER) # pragma warning(disable : 4505) /* unreferenced local function has been removed */ -# endif +# endif #endif #ifndef SWIGUNUSEDPARM # ifdef __cplusplus # define SWIGUNUSEDPARM(p) # else -# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# define SWIGUNUSEDPARM(p) p SWIGUNUSED # endif #endif @@ -106,7 +106,7 @@ # define SWIGSTDCALL __stdcall # else # define SWIGSTDCALL -# endif +# endif #endif /* Deal with Microsoft's attempt at deprecating C standard runtime functions */ @@ -215,7 +215,7 @@ static int __dbj_throw(JNIEnv *jenv, static JavaVM *javavm; static jclass db_class, dbc_class, dbenv_class, dbt_class, dblsn_class; -static jclass dbpreplist_class, dbtxn_class; +static jclass dbpreplist_class, dbstream_class, dbtxn_class; static jclass keyrange_class; static jclass bt_stat_class, compact_class, h_stat_class, heap_stat_class; static jclass lock_stat_class, log_stat_class, mpool_stat_class, mpool_fstat_class; @@ -225,7 +225,7 @@ static jclass seq_stat_class, txn_stat_class; static jclass txn_active_class; static jclass lock_class, lockreq_class; static jclass dbex_class, deadex_class, heapfullex_class, lockex_class, memex_class; -static jclass repdupmasterex_class, rephandledeadex_class; +static jclass metachkfailex_class, repdupmasterex_class, rephandledeadex_class; static jclass repholdelectionex_class, repjoinfailex_class; static jclass repleaseexpiredex_class; static jclass replockoutex_class, repunavailex_class; @@ -237,6 +237,7 @@ static jfieldID dbc_cptr_fid; static jfieldID dblsn_file_fid, dblsn_offset_fid; static jfieldID dbt_data_fid, dbt_data_nio_fid, dbt_size_fid, dbt_ulen_fid; static jfieldID dbt_dlen_fid, dbt_doff_fid, dbt_flags_fid, dbt_offset_fid; +static jfieldID dbstream_cptr_fid; static jfieldID kr_less_fid, kr_equal_fid, kr_greater_fid; static jfieldID lock_cptr_fid; static jfieldID lockreq_op_fid, lockreq_modeflag_fid, lockreq_timeout_fid; @@ -253,6 +254,7 @@ static jfieldID bt_stat_bt_ndata_fid; static jfieldID bt_stat_bt_pagecnt_fid; static jfieldID bt_stat_bt_pagesize_fid; static jfieldID bt_stat_bt_minkey_fid; +static jfieldID bt_stat_bt_nblobs_fid; static jfieldID bt_stat_bt_re_len_fid; static jfieldID bt_stat_bt_re_pad_fid; static jfieldID bt_stat_bt_levels_fid; @@ -281,6 +283,7 @@ static jfieldID h_stat_hash_version_fid; static jfieldID h_stat_hash_metaflags_fid; static jfieldID h_stat_hash_nkeys_fid; static jfieldID h_stat_hash_ndata_fid; +static jfieldID h_stat_hash_nblobs_fid; static jfieldID h_stat_hash_pagecnt_fid; static jfieldID h_stat_hash_pagesize_fid; static jfieldID h_stat_hash_ffactor_fid; @@ -296,6 +299,7 @@ static jfieldID h_stat_hash_dup_free_fid; static jfieldID heap_stat_heap_magic_fid; static jfieldID heap_stat_heap_version_fid; static jfieldID heap_stat_heap_metaflags_fid; +static jfieldID heap_stat_heap_nblobs_fid; static jfieldID heap_stat_heap_nrecs_fid; static jfieldID heap_stat_heap_pagecnt_fid; static jfieldID heap_stat_heap_pagesize_fid; @@ -348,6 +352,8 @@ static jfieldID lock_stat_st_lockers_wait_fid; static jfieldID lock_stat_st_lockers_nowait_fid; static jfieldID lock_stat_st_region_wait_fid; static jfieldID lock_stat_st_region_nowait_fid; +static jfieldID lock_stat_st_nlockers_hit_fid; +static jfieldID lock_stat_st_nlockers_reused_fid; static jfieldID lock_stat_st_hash_len_fid; static jfieldID lock_stat_st_regsize_fid; static jfieldID log_stat_st_magic_fid; @@ -420,6 +426,7 @@ static jfieldID mpool_stat_st_region_wait_fid; static jfieldID mpool_stat_st_mvcc_frozen_fid; static jfieldID mpool_stat_st_mvcc_thawed_fid; static jfieldID mpool_stat_st_mvcc_freed_fid; +static jfieldID mpool_stat_st_mvcc_reused_fid; static jfieldID mpool_stat_st_alloc_fid; static jfieldID mpool_stat_st_alloc_buckets_fid; static jfieldID mpool_stat_st_alloc_max_buckets_fid; @@ -427,6 +434,8 @@ static jfieldID mpool_stat_st_alloc_pages_fid; static jfieldID mpool_stat_st_alloc_max_pages_fid; static jfieldID mpool_stat_st_io_wait_fid; static jfieldID mpool_stat_st_sync_interrupted_fid; +static jfieldID mpool_stat_st_oddfsize_detect_fid; +static jfieldID mpool_stat_st_oddfsize_resolve_fid; static jfieldID mpool_stat_st_regsize_fid; static jfieldID mpool_stat_st_regmax_fid; static jfieldID mutex_stat_st_mutex_align_fid; @@ -455,6 +464,7 @@ static jfieldID qam_stat_qs_pgfree_fid; static jfieldID qam_stat_qs_first_recno_fid; static jfieldID qam_stat_qs_cur_recno_fid; static jfieldID rep_stat_st_startup_complete_fid; +static jfieldID rep_stat_st_view_fid; static jfieldID rep_stat_st_log_queued_fid; static jfieldID rep_stat_st_status_fid; static jfieldID rep_stat_st_next_lsn_fid; @@ -518,10 +528,17 @@ static jfieldID rep_stat_st_max_lease_usec_fid; static jfieldID repmgr_stat_st_perm_failed_fid; static jfieldID repmgr_stat_st_msgs_queued_fid; static jfieldID repmgr_stat_st_msgs_dropped_fid; +static jfieldID repmgr_stat_st_incoming_queue_gbytes_fid; +static jfieldID repmgr_stat_st_incoming_queue_bytes_fid; +static jfieldID repmgr_stat_st_incoming_msgs_dropped_fid; static jfieldID repmgr_stat_st_connection_drop_fid; static jfieldID repmgr_stat_st_connect_fail_fid; static jfieldID repmgr_stat_st_elect_threads_fid; static jfieldID repmgr_stat_st_max_elect_threads_fid; +static jfieldID repmgr_stat_st_site_participants_fid; +static jfieldID repmgr_stat_st_site_total_fid; +static jfieldID repmgr_stat_st_site_views_fid; +static jfieldID repmgr_stat_st_takeovers_fid; static jfieldID seq_stat_st_wait_fid; static jfieldID seq_stat_st_nowait_fid; static jfieldID seq_stat_st_current_fid; @@ -569,7 +586,8 @@ static jmethodID rep_stat_construct, repmgr_stat_construct, seq_stat_construct; static jmethodID txn_stat_construct, txn_active_construct; static jmethodID dbex_construct, deadex_construct, lockex_construct; static jmethodID heapfullex_construct, memex_construct, memex_update_method; -static jmethodID repdupmasterex_construct, rephandledeadex_construct; +static jmethodID metachkfailex_construct, repdupmasterex_construct; +static jmethodID rephandledeadex_construct; static jmethodID repholdelectionex_construct, repjoinfailex_construct; static jmethodID repmgr_siteinfo_construct, rephost_construct, repleaseexpiredex_construct; static jmethodID replockoutex_construct; @@ -581,7 +599,9 @@ static jmethodID lock_construct; static jmethodID app_dispatch_method, errcall_method, env_feedback_method; static jmethodID msgcall_method, paniccall_method, rep_transport_method; -static jmethodID panic_event_notify_method, rep_client_event_notify_method; +static jmethodID panic_event_notify_method; +static jmethodID rep_autotakeover_failed_event_notify_method; +static jmethodID rep_client_event_notify_method; static jmethodID rep_connect_broken_event_notify_method; static jmethodID rep_connect_established_event_notify_method; static jmethodID rep_connect_try_failed_event_notify_method; @@ -589,6 +609,7 @@ static jmethodID rep_dupmaster_event_notify_method; static jmethodID rep_elected_event_notify_method; static jmethodID rep_election_failed_event_notify_method; static jmethodID rep_init_done_event_notify_method; +static jmethodID rep_inqueue_full_event_notify_method; static jmethodID rep_join_failure_event_notify_method; static jmethodID rep_local_site_removed_notify_method; static jmethodID rep_master_event_notify_method; @@ -606,7 +627,7 @@ static jmethodID backup_write_method, bt_compare_method, bt_compress_method; static jmethodID bt_decompress_method, bt_prefix_method; static jmethodID db_feedback_method, dup_compare_method; static jmethodID foreignkey_nullify_method, h_compare_method, h_hash_method; -static jmethodID partition_method, seckey_create_method; +static jmethodID rep_view_method, partition_method, seckey_create_method; static jmethodID outputstream_write_method; @@ -620,6 +641,7 @@ const struct { { &dbt_class, DB_PKG "DatabaseEntry" }, { &dblsn_class, DB_PKG "LogSequenceNumber" }, { &dbpreplist_class, DB_PKG "PreparedTransaction" }, + { &dbstream_class, DB_PKG "internal/DbStream" }, { &dbtxn_class, DB_PKG "internal/DbTxn" }, { &bt_stat_class, DB_PKG "BtreeStats" }, @@ -647,6 +669,7 @@ const struct { { &heapfullex_class, DB_PKG "HeapFullException" }, { &lockex_class, DB_PKG "LockNotGrantedException" }, { &memex_class, DB_PKG "MemoryException" }, + { &metachkfailex_class, DB_PKG "MetaCheckSumFailException" }, { &repdupmasterex_class, DB_PKG "ReplicationDuplicateMasterException" }, { &rephandledeadex_class, DB_PKG "ReplicationHandleDeadException" }, { &repholdelectionex_class, DB_PKG "ReplicationHoldElectionException" }, @@ -678,6 +701,8 @@ const struct { { &dblsn_file_fid, &dblsn_class, "file", "I" }, { &dblsn_offset_fid, &dblsn_class, "offset", "I" }, + { &dbstream_cptr_fid, &dbstream_class, "swigCPtr", "J" }, + { &dbt_data_fid, &dbt_class, "data", "[B" }, { &dbt_data_nio_fid, &dbt_class, "data_nio", "Ljava/nio/ByteBuffer;" }, { &dbt_size_fid, &dbt_class, "size", "I" }, @@ -711,6 +736,7 @@ const struct { { &bt_stat_bt_pagecnt_fid, &bt_stat_class, "bt_pagecnt", "I" }, { &bt_stat_bt_pagesize_fid, &bt_stat_class, "bt_pagesize", "I" }, { &bt_stat_bt_minkey_fid, &bt_stat_class, "bt_minkey", "I" }, + { &bt_stat_bt_nblobs_fid, &bt_stat_class, "bt_nblobs", "I" }, { &bt_stat_bt_re_len_fid, &bt_stat_class, "bt_re_len", "I" }, { &bt_stat_bt_re_pad_fid, &bt_stat_class, "bt_re_pad", "I" }, { &bt_stat_bt_levels_fid, &bt_stat_class, "bt_levels", "I" }, @@ -739,6 +765,7 @@ const struct { { &h_stat_hash_metaflags_fid, &h_stat_class, "hash_metaflags", "I" }, { &h_stat_hash_nkeys_fid, &h_stat_class, "hash_nkeys", "I" }, { &h_stat_hash_ndata_fid, &h_stat_class, "hash_ndata", "I" }, + { &h_stat_hash_nblobs_fid, &h_stat_class, "hash_nblobs", "I" }, { &h_stat_hash_pagecnt_fid, &h_stat_class, "hash_pagecnt", "I" }, { &h_stat_hash_pagesize_fid, &h_stat_class, "hash_pagesize", "I" }, { &h_stat_hash_ffactor_fid, &h_stat_class, "hash_ffactor", "I" }, @@ -754,6 +781,7 @@ const struct { { &heap_stat_heap_magic_fid, &heap_stat_class, "heap_magic", "I" }, { &heap_stat_heap_version_fid, &heap_stat_class, "heap_version", "I" }, { &heap_stat_heap_metaflags_fid, &heap_stat_class, "heap_metaflags", "I" }, + { &heap_stat_heap_nblobs_fid, &heap_stat_class, "heap_nblobs", "I" }, { &heap_stat_heap_nrecs_fid, &heap_stat_class, "heap_nrecs", "I" }, { &heap_stat_heap_pagecnt_fid, &heap_stat_class, "heap_pagecnt", "I" }, { &heap_stat_heap_pagesize_fid, &heap_stat_class, "heap_pagesize", "I" }, @@ -806,6 +834,8 @@ const struct { { &lock_stat_st_lockers_nowait_fid, &lock_stat_class, "st_lockers_nowait", "J" }, { &lock_stat_st_region_wait_fid, &lock_stat_class, "st_region_wait", "J" }, { &lock_stat_st_region_nowait_fid, &lock_stat_class, "st_region_nowait", "J" }, + { &lock_stat_st_nlockers_hit_fid, &lock_stat_class, "st_nlockers_hit", "J" }, + { &lock_stat_st_nlockers_reused_fid, &lock_stat_class, "st_nlockers_reused", "J" }, { &lock_stat_st_hash_len_fid, &lock_stat_class, "st_hash_len", "I" }, { &lock_stat_st_regsize_fid, &lock_stat_class, "st_regsize", "J" }, { &log_stat_st_magic_fid, &log_stat_class, "st_magic", "I" }, @@ -878,6 +908,7 @@ const struct { { &mpool_stat_st_mvcc_frozen_fid, &mpool_stat_class, "st_mvcc_frozen", "J" }, { &mpool_stat_st_mvcc_thawed_fid, &mpool_stat_class, "st_mvcc_thawed", "J" }, { &mpool_stat_st_mvcc_freed_fid, &mpool_stat_class, "st_mvcc_freed", "J" }, + { &mpool_stat_st_mvcc_reused_fid, &mpool_stat_class, "st_mvcc_reused", "J" }, { &mpool_stat_st_alloc_fid, &mpool_stat_class, "st_alloc", "J" }, { &mpool_stat_st_alloc_buckets_fid, &mpool_stat_class, "st_alloc_buckets", "J" }, { &mpool_stat_st_alloc_max_buckets_fid, &mpool_stat_class, "st_alloc_max_buckets", "J" }, @@ -885,6 +916,8 @@ const struct { { &mpool_stat_st_alloc_max_pages_fid, &mpool_stat_class, "st_alloc_max_pages", "J" }, { &mpool_stat_st_io_wait_fid, &mpool_stat_class, "st_io_wait", "J" }, { &mpool_stat_st_sync_interrupted_fid, &mpool_stat_class, "st_sync_interrupted", "J" }, + { &mpool_stat_st_oddfsize_detect_fid, &mpool_stat_class, "st_oddfsize_detect", "I" }, + { &mpool_stat_st_oddfsize_resolve_fid, &mpool_stat_class, "st_oddfsize_resolve", "I" }, { &mpool_stat_st_regsize_fid, &mpool_stat_class, "st_regsize", "J" }, { &mpool_stat_st_regmax_fid, &mpool_stat_class, "st_regmax", "J" }, { &mutex_stat_st_mutex_align_fid, &mutex_stat_class, "st_mutex_align", "I" }, @@ -913,6 +946,7 @@ const struct { { &qam_stat_qs_first_recno_fid, &qam_stat_class, "qs_first_recno", "I" }, { &qam_stat_qs_cur_recno_fid, &qam_stat_class, "qs_cur_recno", "I" }, { &rep_stat_st_startup_complete_fid, &rep_stat_class, "st_startup_complete", "I" }, + { &rep_stat_st_view_fid, &rep_stat_class, "st_view", "I" }, { &rep_stat_st_log_queued_fid, &rep_stat_class, "st_log_queued", "J" }, { &rep_stat_st_status_fid, &rep_stat_class, "st_status", "I" }, { &rep_stat_st_next_lsn_fid, &rep_stat_class, "st_next_lsn", "L" DB_PKG "LogSequenceNumber;" }, @@ -976,10 +1010,17 @@ const struct { { &repmgr_stat_st_perm_failed_fid, &repmgr_stat_class, "st_perm_failed", "J" }, { &repmgr_stat_st_msgs_queued_fid, &repmgr_stat_class, "st_msgs_queued", "J" }, { &repmgr_stat_st_msgs_dropped_fid, &repmgr_stat_class, "st_msgs_dropped", "J" }, + { &repmgr_stat_st_incoming_queue_gbytes_fid, &repmgr_stat_class, "st_incoming_queue_gbytes", "I" }, + { &repmgr_stat_st_incoming_queue_bytes_fid, &repmgr_stat_class, "st_incoming_queue_bytes", "I" }, + { &repmgr_stat_st_incoming_msgs_dropped_fid, &repmgr_stat_class, "st_incoming_msgs_dropped", "J" }, { &repmgr_stat_st_connection_drop_fid, &repmgr_stat_class, "st_connection_drop", "J" }, { &repmgr_stat_st_connect_fail_fid, &repmgr_stat_class, "st_connect_fail", "J" }, - { &repmgr_stat_st_elect_threads_fid, &repmgr_stat_class, "st_elect_threads", "J" }, - { &repmgr_stat_st_max_elect_threads_fid, &repmgr_stat_class, "st_max_elect_threads", "J" }, + { &repmgr_stat_st_elect_threads_fid, &repmgr_stat_class, "st_elect_threads", "I" }, + { &repmgr_stat_st_max_elect_threads_fid, &repmgr_stat_class, "st_max_elect_threads", "I" }, + { &repmgr_stat_st_site_participants_fid, &repmgr_stat_class, "st_site_participants", "I" }, + { &repmgr_stat_st_site_total_fid, &repmgr_stat_class, "st_site_total", "I" }, + { &repmgr_stat_st_site_views_fid, &repmgr_stat_class, "st_site_views", "I" }, + { &repmgr_stat_st_takeovers_fid, &repmgr_stat_class, "st_takeovers", "J" }, { &seq_stat_st_wait_fid, &seq_stat_class, "st_wait", "J" }, { &seq_stat_st_nowait_fid, &seq_stat_class, "st_nowait", "J" }, { &seq_stat_st_current_fid, &seq_stat_class, "st_current", "J" }, @@ -1068,6 +1109,8 @@ const struct { DB_PKG "internal/DbEnv;)V" }, { &memex_update_method, &memex_class, "updateDatabaseEntry", "(L" DB_PKG "DatabaseEntry;)V" }, + { &metachkfailex_construct, &metachkfailex_class, "<init>", + "(Ljava/lang/String;IL" DB_PKG "internal/DbEnv;)V" }, { &repdupmasterex_construct, &repdupmasterex_class, "<init>", "(Ljava/lang/String;IL" DB_PKG "internal/DbEnv;)V" }, { &rephandledeadex_construct, &rephandledeadex_class, "<init>", @@ -1105,6 +1148,8 @@ const struct { "(III[B)I" }, { &panic_event_notify_method, &dbenv_class, "handle_panic_event_notify", "()V" }, + { &rep_autotakeover_failed_event_notify_method, &dbenv_class, + "handle_rep_autotakeover_failed_event_notify", "()V" }, { &rep_connect_broken_event_notify_method, &dbenv_class, "handle_rep_connect_broken_event_notify", "()V" }, { &rep_connect_established_event_notify_method, &dbenv_class, @@ -1121,6 +1166,8 @@ const struct { "handle_rep_election_failed_event_notify" ,"()V" }, { &rep_init_done_event_notify_method, &dbenv_class, "handle_rep_init_done_event_notify" , "()V" }, + { &rep_inqueue_full_event_notify_method, &dbenv_class, + "handle_rep_inqueue_full_event_notify" , "()V" }, { &rep_join_failure_event_notify_method, &dbenv_class, "handle_rep_join_failure_event_notify" ,"()V" }, { &rep_master_event_notify_method, &dbenv_class, @@ -1183,6 +1230,8 @@ const struct { { &seckey_create_method, &db_class, "handle_seckey_create", "(L" DB_PKG "DatabaseEntry;L" DB_PKG "DatabaseEntry;)[L" DB_PKG "DatabaseEntry;" }, + {&rep_view_method, &dbenv_class, "handle_rep_view", + "(Ljava/lang/String;I)Z" }, { &outputstream_write_method, &outputstream_class, "write", "([BII)V" } }; @@ -1291,7 +1340,7 @@ static void __dbj_detach() (void)(*javavm)->DetachCurrentThread(javavm); } -static jobject __dbj_wrap_DB_LSN(JNIEnv *jenv, DB_LSN *lsn) +static jobject __dbj_wrap_DB_LSN(JNIEnv *jenv, const DB_LSN *lsn) { return (*jenv)->NewObject(jenv, dblsn_class, dblsn_construct, lsn->file, lsn->offset); @@ -1344,6 +1393,10 @@ static jthrowable __dbj_get_except(JNIEnv *jenv, return (jthrowable)(*jenv)->NewObject(jenv, heapfullex_class, heapfullex_construct, jmsg, ret, jdbenv); + case DB_META_CHKSUM_FAIL: + return (jthrowable)(*jenv)->NewObject(jenv, metachkfailex_class, + metachkfailex_construct, jmsg, ret, jdbenv); + case DB_REP_DUPMASTER: return (jthrowable)(*jenv)->NewObject(jenv, repdupmasterex_class, repdupmasterex_construct, @@ -1464,6 +1517,7 @@ struct __db_repmgr_sites { #define DbMpoolFile __db_mpoolfile #define DbSequence __db_sequence #define DbSite __db_site +#define DbStream __db_stream #define DbTxn __db_txn /* Suppress a compilation warning for an unused symbol */ @@ -1482,6 +1536,11 @@ typedef struct __dbt_locked { jsize array_len; } DBT_LOCKED; +struct __dbt_arr { + DBT *arr_ptr; + int len; +}; + static int __dbj_dbt_memcopy(DBT *dbt, u_int32_t offset, void *buf, u_int32_t size, u_int32_t flags) { DBT_LOCKED *ldbt = dbt->app_data; JNIEnv *jenv = ldbt->jenv; @@ -1947,11 +2006,14 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1commit(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { struct DbTxn *txn = (struct DbTxn *) 0 ; + DB_ENV *dbenv = (DB_ENV *) 0 ; + DB_REP_STAT *rep_stat = (DB_REP_STAT *) 0 ; ENV *env = (ENV *) 0 ; u_int32_t flags; DB_TXN_TOKEN token; db_ret_t result; db_ret_t result1; + db_ret_t result2; int is_nested, is_logging_enabled, is_rep_client, commit_token_enabled; (void)jcls; @@ -1973,11 +2035,22 @@ Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1commit(JNIEnv *jenv, * client node. */ env = txn->mgrp->env; + dbenv = env->dbenv; is_nested = (txn->parent != NULL); is_logging_enabled = env->lg_handle != NULL; - is_rep_client = (env->rep_handle != NULL && - env->rep_handle->region != NULL && - F_ISSET((env->rep_handle->region), REP_F_CLIENT)); + /* + * It is an illegal configuration to enable Java and disable statistics + * or enable the small build, so Java should always have access to the + * stat function. + */ + is_rep_client = 0; + if (env->rep_handle != NULL && env->rep_handle->region != NULL) { + result2 = dbenv->rep_stat(dbenv, &rep_stat, 0); + if (DB_RETOK_STD(result2)) { + is_rep_client = (rep_stat->st_status == DB_REP_CLIENT); + free(rep_stat); + } + } commit_token_enabled = (!is_nested && is_logging_enabled && !is_rep_client); if (commit_token_enabled) { @@ -2200,6 +2273,10 @@ static void __dbj_event_notify(DB_ENV *dbenv, u_int32_t event_id, void * info) (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, panic_event_notify_method); break; + case DB_EVENT_REP_AUTOTAKEOVER_FAILED: + (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, + dbenv_class, rep_autotakeover_failed_event_notify_method); + break; case DB_EVENT_REP_CLIENT: (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_client_event_notify_method); @@ -2232,6 +2309,10 @@ static void __dbj_event_notify(DB_ENV *dbenv, u_int32_t event_id, void * info) (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_init_done_event_notify_method); break; + case DB_EVENT_REP_INQUEUE_FULL: + (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, + dbenv_class, rep_inqueue_full_event_notify_method); + break; case DB_EVENT_REP_JOIN_FAILURE: (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_join_failure_event_notify_method); @@ -2672,8 +2753,11 @@ err: if (dbt1->app_data == NULL) return (ret); } -static int __dbj_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_bt_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { + if (locp != NULL) + locp = NULL; return __dbj_am_compare(db, dbt1, dbt2, bt_compare_method); } @@ -2879,7 +2963,8 @@ err: if (dbt1->app_data == NULL) { return (ret); } -static int __dbj_dup_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_dup_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { int detach; JNIEnv *jenv = __dbj_get_jnienv(&detach); @@ -2887,6 +2972,8 @@ static int __dbj_dup_compare(DB *db, const DBT *dbt1, const DBT *dbt2) jbyteArray jdbtarr1, jdbtarr2; int ret; + if (locp != NULL) + locp = NULL; if (jdb == NULL) return (EINVAL); @@ -2932,8 +3019,11 @@ static void __dbj_db_feedback(DB *db, int opcode, int percent) __dbj_detach(); } -static int __dbj_h_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_h_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { + if (locp != NULL) + locp = NULL; return __dbj_am_compare(db, dbt1, dbt2, h_compare_method); } @@ -3078,6 +3168,40 @@ err: if (detach) return (ret); } +static int __dbj_rep_view(DB_ENV *dbenv, const char *name, int *result, u_int32_t flags) { + int detach; + JNIEnv *jenv = __dbj_get_jnienv(&detach); + jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv); + jobject jname; + jboolean jresult; + int ret; + + if (jdbenv == NULL) { + ret = EINVAL; + goto err; + } + + jname = (*jenv)->NewStringUTF(jenv, name); + + jresult = (*jenv)->CallNonvirtualBooleanMethod(jenv, jdbenv, dbenv_class, rep_view_method, jname, flags); + + if ((*jenv)->ExceptionOccurred(jenv)) { + /* The exception will be thrown, so this could be any error. */ + ret = EINVAL; + goto err; + } + + ret = 0; + if (jresult == JNI_FALSE) + *result = 0; + else + *result = 1; + +err: if (detach) + __dbj_detach(); + return (ret); +} + SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_initDbEnvRef0( @@ -3185,6 +3309,21 @@ SWIGINTERN u_int32_t Db_get_assoc_flags(struct Db *self){ errno = self->get_assoc_flags(self, &ret); return ret; } +SWIGINTERN char const *Db_get_blob_dir(struct Db *self){ + const char *ret; + errno = self->get_blob_dir(self, &ret); + return ret; + } +SWIGINTERN char const *Db_get_blob_sub_dir(struct Db *self){ + const char *ret; + errno = self->get_blob_sub_dir(self, &ret); + return ret; + } +SWIGINTERN u_int32_t Db_get_blob_threshold(struct Db *self){ + u_int32_t ret = 0; + errno = self->get_blob_threshold(self, &ret); + return ret; + } SWIGINTERN int_bool Db_get_byteswapped(struct Db *self){ int ret = 0; errno = self->get_byteswapped(self, &ret); @@ -3289,9 +3428,12 @@ SWIGINTERN char const **Db_get_partition_dirs(struct Db *self){ errno = self->get_partition_dirs(self, &ret); return ret; } -SWIGINTERN DBT *Db_get_partition_keys(struct Db *self){ - DBT *ret = NULL; - errno = self->get_partition_keys(self, NULL, &ret); +SWIGINTERN struct __dbt_arr Db_get_partition_keys(struct Db *self){ + struct __dbt_arr ret; + u_int32_t len; + errno = self->get_partition_keys(self, &len, &ret.arr_ptr); + ret.len = (int)len; + ret.len--; return ret; } SWIGINTERN int Db_get_partition_parts(struct Db *self){ @@ -3360,7 +3502,13 @@ SWIGINTERN db_ret_t Db_rename(struct Db *self,char const *file,char const *datab SWIGINTERN db_ret_t Db_set_append_recno(struct Db *self,int (*db_append_recno_fcn)(DB *,DBT *,db_recno_t)){ return self->set_append_recno(self, db_append_recno_fcn); } -SWIGINTERN db_ret_t Db_set_bt_compare(struct Db *self,int (*bt_compare_fcn)(DB *,DBT const *,DBT const *)){ +SWIGINTERN db_ret_t Db_set_blob_dir(struct Db *self,char const *dir){ + return self->set_blob_dir(self, dir); + } +SWIGINTERN db_ret_t Db_set_blob_threshold(struct Db *self,u_int32_t bytes,u_int32_t flags){ + return self->set_blob_threshold(self, bytes, flags); + } +SWIGINTERN db_ret_t Db_set_bt_compare(struct Db *self,int (*bt_compare_fcn)(DB *,DBT const *,DBT const *,size_t *)){ return self->set_bt_compare(self, bt_compare_fcn); } SWIGINTERN db_ret_t Db_set_bt_minkey(struct Db *self,u_int32_t bt_minkey){ @@ -3381,7 +3529,7 @@ SWIGINTERN db_ret_t Db_set_cachesize(struct Db *self,jlong bytes,int ncache){ SWIGINTERN db_ret_t Db_set_create_dir(struct Db *self,char const *dir){ return self->set_create_dir(self, dir); } -SWIGINTERN db_ret_t Db_set_dup_compare(struct Db *self,int (*dup_compare_fcn)(DB *,DBT const *,DBT const *)){ +SWIGINTERN db_ret_t Db_set_dup_compare(struct Db *self,int (*dup_compare_fcn)(DB *,DBT const *,DBT const *,size_t *)){ return self->set_dup_compare(self, dup_compare_fcn); } SWIGINTERN db_ret_t Db_set_encrypt(struct Db *self,char const *passwd,u_int32_t flags){ @@ -3401,7 +3549,7 @@ SWIGINTERN db_ret_t Db_set_heapsize(struct Db *self,jlong bytes){ SWIGINTERN db_ret_t Db_set_heap_regionsize(struct Db *self,u_int32_t npages){ return self->set_heap_regionsize(self, npages); } -SWIGINTERN db_ret_t Db_set_h_compare(struct Db *self,int (*h_compare_fcn)(DB *,DBT const *,DBT const *)){ +SWIGINTERN db_ret_t Db_set_h_compare(struct Db *self,int (*h_compare_fcn)(DB *,DBT const *,DBT const *,size_t *)){ return self->set_h_compare(self, h_compare_fcn); } SWIGINTERN db_ret_t Db_set_h_ffactor(struct Db *self,u_int32_t h_ffactor){ @@ -3419,6 +3567,32 @@ SWIGINTERN db_ret_t Db_set_lk_exclusive(struct Db *self,int nowait){ SWIGINTERN db_ret_t Db_set_lorder(struct Db *self,int lorder){ return self->set_lorder(self, lorder); } +SWIGINTERN int Db_set_msgfile(struct Db *self,char const *msgfile){ + int ret; + FILE *fmsg; + ret = 0; + fmsg = NULL; + self->get_msgfile(self, &fmsg); + if (fmsg != NULL && fmsg != stdout && fmsg != stderr) { + fclose(fmsg); + fmsg = NULL; + } + if (strcmp(msgfile, "") == 0 || msgfile == NULL) + self->set_msgfile(self, NULL); + else if (strcmp(msgfile, "stdout") == 0) + self->set_msgfile(self, stdout); + else if (strcmp(msgfile, "stderr") == 0) + self->set_msgfile(self, stderr); + else { + fmsg = fopen(msgfile, "a"); + if (fmsg != NULL) { + self->set_msgfile(self, fmsg); + } + else + ret = 1; + } + return ret; + } SWIGINTERN db_ret_t Db_set_pagesize(struct Db *self,u_int32_t pagesize){ return self->set_pagesize(self, pagesize); } @@ -3454,6 +3628,9 @@ SWIGINTERN void *Db_stat(struct Db *self,DB_TXN *txnid,u_int32_t flags){ errno = self->stat(self, txnid, &statp, flags); return statp; } +SWIGINTERN int Db_stat_print(struct Db *self,u_int32_t flags){ + return self->stat_print(self, flags); + } SWIGINTERN db_ret_t Db_sync(struct Db *self,u_int32_t flags){ return self->sync(self, flags); } @@ -3493,6 +3670,11 @@ SWIGINTERN db_recno_t Dbc_count(struct Dbc *self,u_int32_t flags){ errno = self->count(self, &count, flags); return count; } +SWIGINTERN DB_STREAM *Dbc_db_stream(struct Dbc *self,u_int32_t flags){ + DB_STREAM *dbsp = NULL; + errno = self->db_stream(self, &dbsp, flags); + return dbsp; + } SWIGINTERN int Dbc_del(struct Dbc *self,u_int32_t flags){ return self->del(self, flags); } @@ -3549,6 +3731,16 @@ SWIGINTERN DB_TXN *DbEnv_cdsgroup_begin(struct DbEnv *self){ SWIGINTERN db_ret_t DbEnv_fileid_reset(struct DbEnv *self,char const *file,u_int32_t flags){ return self->fileid_reset(self, file, flags); } +SWIGINTERN char const *DbEnv_get_blob_dir(struct DbEnv *self){ + const char *ret; + errno = self->get_blob_dir(self, &ret); + return ret; + } +SWIGINTERN u_int32_t DbEnv_get_blob_threshold(struct DbEnv *self){ + u_int32_t ret; + errno = self->get_blob_threshold(self, &ret); + return ret; + } SWIGINTERN char const **DbEnv_get_data_dirs(struct DbEnv *self){ const char **ret; errno = self->get_data_dirs(self, &ret); @@ -3612,6 +3804,12 @@ SWIGINTERN db_ret_t DbEnv_open(struct DbEnv *self,char const *db_home,u_int32_t SWIGINTERN db_ret_t DbEnv_remove(struct DbEnv *self,char const *db_home,u_int32_t flags){ return self->remove(self, db_home, flags); } +SWIGINTERN db_ret_t DbEnv_set_blob_dir(struct DbEnv *self,char const *dir){ + return self->set_blob_dir(self, dir); + } +SWIGINTERN db_ret_t DbEnv_set_blob_threshold(struct DbEnv *self,u_int32_t bytes,u_int32_t flags){ + return self->set_blob_threshold(self, bytes, flags); + } SWIGINTERN db_ret_t DbEnv_set_cachesize(struct DbEnv *self,jlong bytes,int ncache){ return self->set_cachesize(self, (u_int32_t)(bytes / GIGABYTE), @@ -3664,6 +3862,32 @@ SWIGINTERN db_ret_t DbEnv_set_mp_tablesize(struct DbEnv *self,u_int32_t mp_table SWIGINTERN void DbEnv_set_msgcall(struct DbEnv *self,void (*db_msgcall_fcn)(DB_ENV const *,char const *)){ self->set_msgcall(self, db_msgcall_fcn); } +SWIGINTERN int DbEnv_set_msgfile(struct DbEnv *self,char const *msgfile){ + int ret; + FILE *fmsg; + ret = 0; + fmsg = NULL; + self->get_msgfile(self, &fmsg); + if (fmsg != NULL && fmsg != stdout && fmsg != stderr) { + fclose(fmsg); + fmsg = NULL; + } + if (strcmp(msgfile, "") == 0 || msgfile == NULL) + self->set_msgfile(self, NULL); + else if (strcmp(msgfile, "stdout") == 0) + self->set_msgfile(self, stdout); + else if (strcmp(msgfile, "stderr") == 0) + self->set_msgfile(self, stderr); + else { + fmsg = fopen(msgfile, "a"); + if (fmsg != NULL) { + self->set_msgfile(self, fmsg); + } + else + ret = 1; + } + return ret; + } SWIGINTERN db_ret_t DbEnv_set_paniccall(struct DbEnv *self,void (*db_panic_fcn)(DB_ENV *,int)){ return self->set_paniccall(self, db_panic_fcn); } @@ -3770,6 +3994,9 @@ SWIGINTERN DB_LOCK_STAT *DbEnv_lock_stat(struct DbEnv *self,u_int32_t flags){ errno = self->lock_stat(self, &statp, flags); return statp; } +SWIGINTERN int DbEnv_lock_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->lock_stat_print(self, flags); + } SWIGINTERN db_ret_t DbEnv_set_lk_conflicts(struct DbEnv *self,struct __db_lk_conflicts conflicts){ return self->set_lk_conflicts(self, conflicts.lk_conflicts, conflicts.lk_modes); @@ -3868,6 +4095,9 @@ SWIGINTERN DB_LOG_STAT *DbEnv_log_stat(struct DbEnv *self,u_int32_t flags){ errno = self->log_stat(self, &sp, flags); return sp; } +SWIGINTERN int DbEnv_log_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->log_stat_print(self, flags); + } SWIGINTERN int DbEnv_log_verify(struct DbEnv *self,char const *envhome,u_int32_t cachesz,char const *dbfile,char const *dbname,time_t stime,time_t etime,u_int32_t stfile,u_int32_t stoffset,u_int32_t efile,u_int32_t eoffset,int caf,int verbose){ return self->env->log_verify_wrap(self->env, envhome, cachesz, dbfile, dbname, stime, etime, stfile, stoffset, efile, @@ -3945,6 +4175,9 @@ SWIGINTERN DB_MPOOL_STAT *DbEnv_memp_stat(struct DbEnv *self,u_int32_t flags){ errno = self->memp_stat(self, &mp_stat, NULL, flags); return mp_stat; } +SWIGINTERN int DbEnv_memp_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->memp_stat_print(self, flags); + } SWIGINTERN DB_MPOOL_FSTAT **DbEnv_memp_fstat(struct DbEnv *self,u_int32_t flags){ DB_MPOOL_FSTAT **mp_fstat = NULL; errno = self->memp_stat(self, NULL, &mp_fstat, flags); @@ -4003,6 +4236,9 @@ SWIGINTERN DB_MUTEX_STAT *DbEnv_mutex_stat(struct DbEnv *self,u_int32_t flags){ errno = self->mutex_stat(self, &statp, flags); return statp; } +SWIGINTERN int DbEnv_mutex_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->mutex_stat_print(self, flags); + } SWIGINTERN u_int32_t DbEnv_get_tx_max(struct DbEnv *self){ u_int32_t ret; errno = self->get_tx_max(self, &ret); @@ -4018,6 +4254,9 @@ SWIGINTERN db_timeout_t DbEnv_get_timeout(struct DbEnv *self,u_int32_t flag){ errno = self->get_timeout(self, &ret, flag); return ret; } +SWIGINTERN int DbEnv_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->stat_print(self, flags); + } SWIGINTERN int DbEnv_txn_applied(struct DbEnv *self,DB_TXN_TOKEN *token,u_int32_t maxwait,u_int32_t flags){ return self->txn_applied(self, token, maxwait, flags); } @@ -4052,6 +4291,9 @@ SWIGINTERN DB_TXN_STAT *DbEnv_txn_stat(struct DbEnv *self,u_int32_t flags){ errno = self->txn_stat(self, &statp, flags); return statp; } +SWIGINTERN int DbEnv_txn_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->txn_stat_print(self, flags); + } SWIGINTERN jlong DbEnv_rep_get_limit(struct DbEnv *self){ u_int32_t gbytes, bytes; errno = self->rep_get_limit(self, &gbytes, &bytes); @@ -4099,6 +4341,9 @@ SWIGINTERN DB_REP_STAT *DbEnv_rep_stat(struct DbEnv *self,u_int32_t flags){ errno = self->rep_stat(self, &statp, flags); return statp; } +SWIGINTERN int DbEnv_rep_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->rep_stat_print(self, flags); + } SWIGINTERN db_ret_t DbEnv_rep_set_limit(struct DbEnv *self,jlong bytes){ return self->rep_set_limit(self, (u_int32_t)(bytes / GIGABYTE), @@ -4125,6 +4370,9 @@ SWIGINTERN db_ret_t DbEnv_rep_set_request(struct DbEnv *self,u_int32_t min,u_int SWIGINTERN db_ret_t DbEnv_rep_set_transport(struct DbEnv *self,int envid,int (*send)(DB_ENV *,DBT const *,DBT const *,DB_LSN const *,int,u_int32_t)){ return self->rep_set_transport(self, envid, send); } +SWIGINTERN db_ret_t DbEnv_rep_set_view(struct DbEnv *self,int (*rep_view_fcn)(DB_ENV *,char const *,int *,u_int32_t)){ + return self->rep_set_view(self, rep_view_fcn); + } SWIGINTERN u_int32_t DbEnv_rep_get_nsites(struct DbEnv *self){ u_int32_t ret; errno = self->rep_get_nsites(self, &ret); @@ -4154,6 +4402,11 @@ SWIGINTERN int DbEnv_repmgr_get_ack_policy(struct DbEnv *self){ errno = self->repmgr_get_ack_policy(self, &ret); return ret; } +SWIGINTERN jlong DbEnv_repmgr_get_incoming_queue_max(struct DbEnv *self){ + u_int32_t gbytes = 0, bytes = 0; + errno = self->repmgr_get_incoming_queue_max(self, &gbytes, &bytes); + return (jlong)gbytes * GIGABYTE + bytes; + } SWIGINTERN DB_SITE *DbEnv_repmgr_local_site(struct DbEnv *self){ DB_SITE *site = NULL; errno = self->repmgr_local_site(self, &site); @@ -4162,6 +4415,11 @@ SWIGINTERN DB_SITE *DbEnv_repmgr_local_site(struct DbEnv *self){ SWIGINTERN db_ret_t DbEnv_repmgr_set_ack_policy(struct DbEnv *self,int policy){ return self->repmgr_set_ack_policy(self, policy); } +SWIGINTERN db_ret_t DbEnv_repmgr_set_incoming_queue_max(struct DbEnv *self,jlong bytes){ + return self->repmgr_set_incoming_queue_max(self, + (u_int32_t)(bytes / GIGABYTE), + (u_int32_t)(bytes % GIGABYTE)); + } SWIGINTERN DB_SITE *DbEnv_repmgr_site(struct DbEnv *self,char const *host,u_int port){ DB_SITE *site = NULL; errno = self->repmgr_site(self, host, port, &site, 0); @@ -4189,9 +4447,17 @@ SWIGINTERN DB_REPMGR_STAT *DbEnv_repmgr_stat(struct DbEnv *self,u_int32_t flags) errno = self->repmgr_stat(self, &statp, flags); return statp; } +SWIGINTERN int DbEnv_repmgr_stat_print(struct DbEnv *self,u_int32_t flags){ + return self->repmgr_stat_print(self, flags); + } SWIGINTERN u_int32_t DbEnv_get_backup_config(struct DbEnv *self,u_int32_t config_type){ u_int32_t ret; errno = self->get_backup_config(self, (DB_BACKUP_CONFIG)config_type, &ret); + if (errno == EINVAL) { + errno = 0; + ret = 0; + } + return ret; } SWIGINTERN db_ret_t DbEnv_backup(struct DbEnv *self,char const *target,u_int32_t flags){ @@ -4210,25 +4476,25 @@ SWIGINTERN db_ret_t DbEnv_set_backup_config(struct DbEnv *self,u_int32_t config_ SWIGINTERN char const *DbEnv_strerror(int ret){ return db_strerror(ret); } -SWIGINTERN int DbEnv_get_version_family(){ +SWIGINTERN int DbEnv_get_version_family(void){ return DB_VERSION_FAMILY; } -SWIGINTERN int DbEnv_get_version_release(){ +SWIGINTERN int DbEnv_get_version_release(void){ return DB_VERSION_RELEASE; } -SWIGINTERN int DbEnv_get_version_major(){ +SWIGINTERN int DbEnv_get_version_major(void){ return DB_VERSION_MAJOR; } -SWIGINTERN int DbEnv_get_version_minor(){ +SWIGINTERN int DbEnv_get_version_minor(void){ return DB_VERSION_MINOR; } -SWIGINTERN int DbEnv_get_version_patch(){ +SWIGINTERN int DbEnv_get_version_patch(void){ return DB_VERSION_PATCH; } -SWIGINTERN char const *DbEnv_get_version_string(){ +SWIGINTERN char const *DbEnv_get_version_string(void){ return DB_VERSION_STRING; } -SWIGINTERN char const *DbEnv_get_version_full_string(){ +SWIGINTERN char const *DbEnv_get_version_full_string(void){ return DB_VERSION_FULL_STRING; } SWIGINTERN void delete_DbLock(struct DbLock *self){ @@ -4279,13 +4545,13 @@ SWIGINTERN struct DbSequence *new_DbSequence(DB *db,u_int32_t flags){ SWIGINTERN db_ret_t DbSequence_close(struct DbSequence *self,u_int32_t flags){ return self->close(self, flags); } -SWIGINTERN db_seq_t DbSequence_get(struct DbSequence *self,DB_TXN *txnid,int32_t delta,u_int32_t flags){ +SWIGINTERN db_seq_t DbSequence_get(struct DbSequence *self,DB_TXN *txnid,u_int32_t delta,u_int32_t flags){ db_seq_t ret = 0; errno = self->get(self, txnid, delta, &ret, flags); return ret; } -SWIGINTERN int32_t DbSequence_get_cachesize(struct DbSequence *self){ - int32_t ret = 0; +SWIGINTERN u_int32_t DbSequence_get_cachesize(struct DbSequence *self){ + u_int32_t ret = 0; errno = self->get_cachesize(self, &ret); return ret; } @@ -4321,7 +4587,7 @@ SWIGINTERN db_ret_t DbSequence_open(struct DbSequence *self,DB_TXN *txnid,DBT *k SWIGINTERN db_ret_t DbSequence_remove(struct DbSequence *self,DB_TXN *txnid,u_int32_t flags){ return self->remove(self, txnid, flags); } -SWIGINTERN db_ret_t DbSequence_set_cachesize(struct DbSequence *self,int32_t size){ +SWIGINTERN db_ret_t DbSequence_set_cachesize(struct DbSequence *self,u_int32_t size){ return self->set_cachesize(self, size); } SWIGINTERN db_ret_t DbSequence_set_flags(struct DbSequence *self,u_int32_t flags){ @@ -4335,6 +4601,9 @@ SWIGINTERN DB_SEQUENCE_STAT *DbSequence_stat(struct DbSequence *self,u_int32_t f errno = self->stat(self, &ret, flags); return ret; } +SWIGINTERN int DbSequence_stat_print(struct DbSequence *self,u_int32_t flags){ + return self->stat_print(self, flags); + } SWIGINTERN db_ret_t DbSite_close(struct DbSite *self){ return self->close(self); } @@ -4359,6 +4628,20 @@ SWIGINTERN db_ret_t DbSite_remove(struct DbSite *self){ SWIGINTERN db_ret_t DbSite_set_config(struct DbSite *self,u_int32_t which,int_bool onoff){ return self->set_config(self, which, onoff); } +SWIGINTERN db_ret_t DbStream_close(struct DbStream *self,u_int32_t flags){ + return self->close(self, flags); + } +SWIGINTERN int DbStream_read(struct DbStream *self,DBT *data,db_off_t offset,u_int32_t size,u_int32_t flags){ + return self->read(self, data, offset, size, flags); + } +SWIGINTERN db_off_t DbStream_size(struct DbStream *self,u_int32_t flags){ + db_off_t ret = 0; + errno = self->size(self, &ret, flags); + return ret; + } +SWIGINTERN int DbStream_write(struct DbStream *self,DBT *data,db_off_t offset,u_int32_t flags){ + return self->write(self, data, offset, flags); + } SWIGINTERN db_ret_t DbTxn_abort(struct DbTxn *self){ return self->abort(self); } @@ -4807,6 +5090,84 @@ SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1asso } +SWIGEXPORT jstring JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1blob_1dir(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + struct Db *arg1 = (struct Db *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (char *)Db_get_blob_dir(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); + } + + if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1blob_1sub_1dir(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + struct Db *arg1 = (struct Db *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (char *)Db_get_blob_sub_dir(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); + } + + if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1blob_1threshold(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + struct Db *arg1 = (struct Db *) 0 ; + u_int32_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (u_int32_t)Db_get_blob_threshold(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jboolean JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1byteswapped(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jboolean jresult = 0 ; struct Db *arg1 = (struct Db *) 0 ; @@ -5350,7 +5711,7 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1g { if (result != NULL) { - /*@SWIG:../lang/java/libdb_java/java_typemaps.i,456,STRING_ARRAY_OUT@*/ int i, len; + /*@SWIG:../lang/java/libdb_java/java_typemaps.i,596,STRING_ARRAY_OUT@*/ int i, len; len = 0; while (result[len] != NULL) @@ -5372,7 +5733,7 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1g SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1partition_1keys(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jobject jresult = 0 ; struct Db *arg1 = (struct Db *) 0 ; - DBT *result = 0 ; + struct __dbt_arr result; (void)jenv; (void)jcls; @@ -5385,12 +5746,53 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1get_1p } errno = 0; - result = (DBT *)Db_get_partition_keys(arg1); + result = Db_get_partition_keys(arg1); if (!DB_RETOK_STD(errno)) { __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); } - jresult = (jobject)result; + { + DBT *dbt; + void *ptr; + int i, ret; + u_int32_t buflen; + + if ((&result)->arr_ptr == NULL || (&result)->len <= 0) + jresult = NULL; + else { + /* Allocate the bulk buffer and make the bulk DBT. */ + for (i = 0, buflen = 0; i < (&result)->len; i++) + buflen += (&result)->arr_ptr[i].size * sizeof(u_int32_t); + buflen += ((&result)->len * 2 + 1) * sizeof(u_int32_t); + if ((ret = __os_malloc(NULL, sizeof(DBT), &dbt)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + if ((ret = __os_malloc(NULL, buflen, &dbt->data)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + dbt->size = dbt->ulen = buflen; + DB_MULTIPLE_INIT(ptr, dbt); + for (i = 0; i < (&result)->len; i++) + DB_MULTIPLE_WRITE_NEXT(ptr, dbt, + (&result)->arr_ptr[i].data, (&result)->arr_ptr[i].size); + + /* Map a bulk DBT into a DatabaseEntry. */ + jresult = (*jenv)->NewObject(jenv, dbt_class, dbt_construct); + __dbj_dbt_copyout(jenv, dbt, NULL, jresult); + if (jresult == NULL) + goto err; + + err: if (dbt != NULL) { + if (dbt->data != NULL) + __os_free(NULL, dbt->data); + __os_free(NULL, dbt); + } + if (ret != 0 || jresult == NULL) + return 0; + } + } return jresult; } @@ -5940,9 +6342,64 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1appe } +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1blob_1dir(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + struct Db *arg1 = (struct Db *) 0 ; + char *arg2 = (char *) 0 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; + } + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)Db_set_blob_dir(arg1,(char const *)arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, DB2JDBENV); + } + + if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); +} + + +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1blob_1threshold(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) { + struct Db *arg1 = (struct Db *) 0 ; + u_int32_t arg2 ; + u_int32_t arg3 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + arg2 = (u_int32_t)jarg2; + arg3 = (u_int32_t)jarg3; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)Db_set_blob_threshold(arg1,arg2,arg3); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, DB2JDBENV); + } + +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1bt_1compare(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) { struct Db *arg1 = (struct Db *) 0 ; - int (*arg2)(DB *,DBT const *,DBT const *) = (int (*)(DB *,DBT const *,DBT const *)) 0 ; + int (*arg2)(DB *,DBT const *,DBT const *,size_t *) = (int (*)(DB *,DBT const *,DBT const *,size_t *)) 0 ; db_ret_t result; (void)jenv; @@ -6103,7 +6560,7 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1crea SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1dup_1compare(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) { struct Db *arg1 = (struct Db *) 0 ; - int (*arg2)(DB *,DBT const *,DBT const *) = (int (*)(DB *,DBT const *,DBT const *)) 0 ; + int (*arg2)(DB *,DBT const *,DBT const *,size_t *) = (int (*)(DB *,DBT const *,DBT const *,size_t *)) 0 ; db_ret_t result; (void)jenv; @@ -6258,7 +6715,7 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1heap SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1h_1compare(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) { struct Db *arg1 = (struct Db *) 0 ; - int (*arg2)(DB *,DBT const *,DBT const *) = (int (*)(DB *,DBT const *,DBT const *)) 0 ; + int (*arg2)(DB *,DBT const *,DBT const *,size_t *) = (int (*)(DB *,DBT const *,DBT const *,size_t *)) 0 ; db_ret_t result; (void)jenv; @@ -6404,6 +6861,38 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1lord } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1msgfile(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jint jresult = 0 ; + struct Db *arg1 = (struct Db *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return 0; + } + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + result = (int)Db_set_msgfile(arg1,(char const *)arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, DB2JDBENV); + } + + jresult = (jint)result; + if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1pagesize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { struct Db *arg1 = (struct Db *) 0 ; u_int32_t arg2 ; @@ -6433,7 +6922,6 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1part u_int32_t arg2 ; DBT *arg3 = (DBT *) 0 ; u_int32_t (*arg4)(DB *,DBT *) = (u_int32_t (*)(DB *,DBT *)) 0 ; - DBT_LOCKED ldbt3 ; db_ret_t result; (void)jenv; @@ -6441,9 +6929,77 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1part (void)jarg1_; arg1 = *(struct Db **)&jarg1; arg2 = (u_int32_t)jarg2; - - if (__dbj_dbt_copyin(jenv, &ldbt3, &arg3, jarg3, 1) != 0) { - return ; /* An exception will be pending. */ + { + DBT_LOCKED lresult; + DBT *dbt; + void *ptr, *retdata; + int cnt, i, ret; + u_int32_t retlen; + + if (jarg3 == NULL) + arg3 = NULL; + else { + /* Copy the DBT from Java to C. */ + if ((ret = __dbj_dbt_copyin(jenv, + &lresult, &dbt, jarg3, 0)) != 0) + /* An exception will be pending. */ + return ; + + /* Get the number of DBT from the bulk buffer. */ + DB_MULTIPLE_INIT(ptr, dbt); + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + cnt = 0; + while (ptr != NULL) { + cnt++; + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + } + + /* Make an array of DBTs. */ + if ((ret = __os_malloc(NULL, + (cnt + 1) * sizeof(DBT), &arg3)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + memset(arg3, 0, (cnt + 1) * sizeof(DBT)); + /* + * Save the key array size in the last entry so that it can + * be used later when free the key array and mark its flags + * as DB_DBT_BULK which is an internal flag that can't be + * passed by users. The last entry will not be read by the C + * call __partition_set since it only reads the first cnt + * DBTs from the key array. + */ + arg3[cnt].size = sizeof(int); + arg3[cnt].data = &cnt; + arg3[cnt].flags = DB_DBT_BULK; + DB_MULTIPLE_INIT(ptr, dbt); + for (i = 0; i < cnt; i++) { + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + if (retlen != 0) { + /* + * If there's data, we need to take a copy + * of it. + */ + arg3[i].size = retlen; + if ((ret = __os_malloc(NULL, + arg3[i].size, &arg3[i].data)) != 0) { + __dbj_throw(jenv, + ret, NULL, NULL, NULL); + goto err; + } + memcpy(arg3[i].data, retdata, retlen); + } + } + + err: if (ret != 0) { + if (arg3 != NULL) { + for (i = 0; i < cnt; i++) + __os_free(NULL, arg3[i].data); + __os_free(NULL, arg3); + } + return ; + } + } } arg4 = (jarg4 == JNI_TRUE) ? __dbj_partition : NULL; @@ -6459,20 +7015,60 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1part __dbj_throw(jenv, result, NULL, NULL, DB2JDBENV); } - __dbj_dbt_release(jenv, jarg3, arg3, &ldbt3); + + { + int cnt, i; + + if (arg3 != NULL) { + /* Get the array size. */ + cnt = 0; + while (arg3[cnt].flags != DB_DBT_BULK) + cnt++; + for (i = 0; i < cnt; i++) + __os_free(NULL, arg3[i].data); + __os_free(NULL, arg3); + } + } + } SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1partition_1dirs(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jobjectArray jarg2) { struct Db *arg1 = (struct Db *) 0 ; char **arg2 = (char **) 0 ; + jint size2 ; db_ret_t result; (void)jenv; (void)jcls; (void)jarg1_; arg1 = *(struct Db **)&jarg1; - arg2 = *(char ***)&jarg2; + { + /*@SWIG:../lang/java/libdb_java/java_typemaps.i,624,STRING_ARRAY_IN@*/ int i, ret; + size_t sz; + + size2 = (*jenv)->GetArrayLength(jenv, jarg2); + sz = (size_t)(size2 + 1) * sizeof(char *); + if ((ret = __os_malloc(NULL, sz, &arg2)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + return ; + } + /* Make a copy of each string. */ + for (i = 0; i < size2; i++) { + jstring j_string = (jstring)(*jenv)->GetObjectArrayElement(jenv, jarg2, i); + const char * c_string = (*jenv)->GetStringUTFChars(jenv, j_string, 0); + sz = strlen(c_string) + 1; + if ((ret = __os_malloc(NULL, sz, &arg2[i])) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + return ; + } + strcpy(arg2[i], c_string); + (*jenv)->ReleaseStringUTFChars(jenv, j_string, c_string); + (*jenv)->DeleteLocalRef(jenv, j_string); + } + arg2[i] = 0; + /*@SWIG@*/ + } if (jarg1 == 0) { __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); @@ -6484,6 +7080,12 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1set_1part __dbj_throw(jenv, result, NULL, NULL, DB2JDBENV); } + { + int i; + for (i = 0; i < size2-1; i++) + __os_free(NULL, arg2[i]); + __os_free(NULL, arg2); + } } @@ -6762,6 +7364,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1stat(J } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct Db *arg1 = (struct Db *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Db **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)Db_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Db_1sync(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { struct Db *arg1 = (struct Db *) 0 ; u_int32_t arg2 ; @@ -6981,6 +7611,34 @@ SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1count(JN } +SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1db_1stream(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jlong jresult = 0 ; + struct Dbc *arg1 = (struct Dbc *) 0 ; + u_int32_t arg2 ; + DB_STREAM *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct Dbc **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (DB_STREAM *)Dbc_db_stream(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, DB2JDBENV); + } + + *(DB_STREAM **)&jresult = result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_Dbc_1del(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { jint jresult = 0 ; struct Dbc *arg1 = (struct Dbc *) 0 ; @@ -7444,6 +8102,58 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1fileid } +SWIGEXPORT jstring JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1blob_1dir(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (char *)DbEnv_get_blob_dir(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1blob_1threshold(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (u_int32_t)DbEnv_get_blob_threshold(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1data_1dirs(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jobjectArray jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -7467,7 +8177,7 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv { if (result != NULL) { - /*@SWIG:../lang/java/libdb_java/java_typemaps.i,456,STRING_ARRAY_OUT@*/ int i, len; + /*@SWIG:../lang/java/libdb_java/java_typemaps.i,596,STRING_ARRAY_OUT@*/ int i, len; len = 0; while (result[len] != NULL) @@ -7837,6 +8547,61 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1remove } +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1blob_1dir(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + char *arg2 = (char *) 0 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; + } + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)DbEnv_set_blob_dir(arg1,(char const *)arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, JDBENV); + } + + if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); +} + + +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1blob_1threshold(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jint jarg3) { + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + u_int32_t arg3 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + arg3 = (u_int32_t)jarg3; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)DbEnv_set_blob_threshold(arg1,arg2,arg3); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, JDBENV); + } + +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1cachesize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jint jarg3) { struct DbEnv *arg1 = (struct DbEnv *) 0 ; jlong arg2 ; @@ -8248,6 +9013,33 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1m } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1msgfile(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return 0; + } + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + result = (int)DbEnv_set_msgfile(arg1,(char const *)arg2); + jresult = (jint)result; + if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1paniccall(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) { struct DbEnv *arg1 = (struct DbEnv *) 0 ; void (*arg2)(DB_ENV *,int) = (void (*)(DB_ENV *,int)) 0 ; @@ -8944,6 +9736,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1loc } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1lock_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_lock_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1set_1lk_1conflicts(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jobjectArray jarg2) { struct DbEnv *arg1 = (struct DbEnv *) 0 ; struct __db_lk_conflicts arg2 ; @@ -9364,7 +10184,7 @@ SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv { if (result != NULL) { - /*@SWIG:../lang/java/libdb_java/java_typemaps.i,456,STRING_ARRAY_OUT@*/ int i, len; + /*@SWIG:../lang/java/libdb_java/java_typemaps.i,596,STRING_ARRAY_OUT@*/ int i, len; len = 0; while (result[len] != NULL) @@ -9746,6 +10566,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_log_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1log_1verify(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jint jarg3, jstring jarg4, jstring jarg5, jlong jarg6, jlong jarg7, jint jarg8, jint jarg9, jint jarg10, jint jarg11, jint jarg12, jint jarg13) { jint jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -10237,6 +11085,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1mem } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1memp_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_memp_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jobjectArray JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1memp_1fstat(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { jobjectArray jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -10650,6 +11526,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1mut } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1mutex_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_mutex_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1tx_1max(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jint jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -10730,6 +11634,34 @@ SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1 } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1applied(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jobject jarg2, jint jarg3, jint jarg4) { jint jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -10748,7 +11680,7 @@ SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1a arg2 = NULL; } else { arg2 = &token2; - (*jenv)->GetByteArrayRegion(jenv, (jbyteArray)jarg2, 0, DB_TXN_TOKEN_SIZE, arg2->buf); + (*jenv)->GetByteArrayRegion(jenv, (jbyteArray)jarg2, 0, DB_TXN_TOKEN_SIZE, (jbyte *)arg2->buf); } arg3 = (u_int32_t)jarg3; @@ -10953,6 +11885,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1txn_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_txn_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1get_1limit(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jlong jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -11319,6 +12279,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_rep_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1set_1limit(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { struct DbEnv *arg1 = (struct DbEnv *) 0 ; jlong arg2 ; @@ -11479,6 +12467,32 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1s } +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1set_1view(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jboolean jarg2) { + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + int (*arg2)(DB_ENV *,char const *,int *,u_int32_t) = (int (*)(DB_ENV *,char const *,int *,u_int32_t)) 0 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + + arg2 = (jarg2 == JNI_TRUE) ? __dbj_rep_view : NULL; + + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)DbEnv_rep_set_view(arg1,arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, JDBENV); + } + +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep_1get_1nsites(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jint jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -11659,6 +12673,32 @@ SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr } +SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr_1get_1incoming_1queue_1max(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jlong jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + jlong result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = DbEnv_repmgr_get_incoming_queue_max(arg1); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = result; + return jresult; +} + + SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr_1local_1site(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jlong jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -11709,6 +12749,30 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr } +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr_1set_1incoming_1queue_1max(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + jlong arg2 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)DbEnv_repmgr_set_incoming_queue_max(arg1,arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, JDBENV); + } + +} + + SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr_1site(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jlong jarg3) { jlong jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -11726,7 +12790,7 @@ SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmg if (!arg2) return 0; } - arg3 = jarg3; + arg3 = (u_int)jarg3; if (jarg1 == 0) { @@ -11922,6 +12986,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1rep } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1repmgr_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbEnv *arg1 = (struct DbEnv *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbEnv **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbEnv_repmgr_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, JDBENV); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbEnv_1get_1backup_1config(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { jint jresult = 0 ; struct DbEnv *arg1 = (struct DbEnv *) 0 ; @@ -12506,7 +13598,7 @@ SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1 jlong jresult = 0 ; struct DbSequence *arg1 = (struct DbSequence *) 0 ; DB_TXN *arg2 = (DB_TXN *) 0 ; - int32_t arg3 ; + u_int32_t arg3 ; u_int32_t arg4 ; db_seq_t result; @@ -12516,7 +13608,7 @@ SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1 (void)jarg2_; arg1 = *(struct DbSequence **)&jarg1; arg2 = *(DB_TXN **)&jarg2; - arg3 = (int32_t)jarg3; + arg3 = (u_int32_t)jarg3; arg4 = (u_int32_t)jarg4; if (jarg1 == 0) { @@ -12538,7 +13630,7 @@ SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1 SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1get_1cachesize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jint jresult = 0 ; struct DbSequence *arg1 = (struct DbSequence *) 0 ; - int32_t result; + u_int32_t result; (void)jenv; (void)jcls; @@ -12551,7 +13643,7 @@ SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1g } errno = 0; - result = (int32_t)DbSequence_get_cachesize(arg1); + result = (u_int32_t)DbSequence_get_cachesize(arg1); if (!DB_RETOK_STD(errno)) { __dbj_throw(jenv, errno, NULL, NULL, NULL); } @@ -12781,14 +13873,14 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1r SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1set_1cachesize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { struct DbSequence *arg1 = (struct DbSequence *) 0 ; - int32_t arg2 ; + u_int32_t arg2 ; db_ret_t result; (void)jenv; (void)jcls; (void)jarg1_; arg1 = *(struct DbSequence **)&jarg1; - arg2 = (int32_t)jarg2; + arg2 = (u_int32_t)jarg2; if (jarg1 == 0) { __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); @@ -12890,6 +13982,34 @@ SWIGEXPORT jobject JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence } +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSequence_1stat_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jint jresult = 0 ; + struct DbSequence *arg1 = (struct DbSequence *) 0 ; + u_int32_t arg2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbSequence **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (int)DbSequence_stat_print(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, NULL); + } + + jresult = (jint)result; + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSite_1close0(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { struct DbSite *arg1 = (struct DbSite *) 0 ; db_ret_t result; @@ -13051,6 +14171,132 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbSite_1set_1 } +SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbStream_1close0(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + struct DbStream *arg1 = (struct DbStream *) 0 ; + u_int32_t arg2 ; + db_ret_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbStream **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return ; + } + + result = (db_ret_t)DbStream_close(arg1,arg2); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, NULL); + } + +} + + +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbStream_1read(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jobject jarg2, jlong jarg3, jint jarg4, jint jarg5) { + jint jresult = 0 ; + struct DbStream *arg1 = (struct DbStream *) 0 ; + DBT *arg2 = (DBT *) 0 ; + db_off_t arg3 ; + u_int32_t arg4 ; + u_int32_t arg5 ; + DBT_LOCKED ldbt2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbStream **)&jarg1; + + if (__dbj_dbt_copyin(jenv, &ldbt2, &arg2, jarg2, 0) != 0) { + return 0; /* An exception will be pending. */ + } + arg3 = (db_off_t)jarg3; + arg4 = (u_int32_t)jarg4; + arg5 = (u_int32_t)jarg5; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + result = (int)DbStream_read(arg1,arg2,arg3,arg4,arg5); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, NULL); + } + + jresult = (jint)result; + __dbj_dbt_release(jenv, jarg2, arg2, &ldbt2); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbStream_1size(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jlong jresult = 0 ; + struct DbStream *arg1 = (struct DbStream *) 0 ; + u_int32_t arg2 ; + db_off_t result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbStream **)&jarg1; + arg2 = (u_int32_t)jarg2; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + errno = 0; + result = (db_off_t)DbStream_size(arg1,arg2); + if (!DB_RETOK_STD(errno)) { + __dbj_throw(jenv, errno, NULL, NULL, NULL); + } + + jresult = (jlong)result; + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbStream_1write(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jobject jarg2, jlong jarg3, jint jarg4) { + jint jresult = 0 ; + struct DbStream *arg1 = (struct DbStream *) 0 ; + DBT *arg2 = (DBT *) 0 ; + db_off_t arg3 ; + u_int32_t arg4 ; + DBT_LOCKED ldbt2 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(struct DbStream **)&jarg1; + + if (__dbj_dbt_copyin(jenv, &ldbt2, &arg2, jarg2, 0) != 0) { + return 0; /* An exception will be pending. */ + } + arg3 = (db_off_t)jarg3; + arg4 = (u_int32_t)jarg4; + + if (jarg1 == 0) { + __dbj_throw(jenv, EINVAL, "call on closed handle", NULL, NULL); + return 0; + } + + result = (int)DbStream_write(arg1,arg2,arg3,arg4); + if (!DB_RETOK_STD(result)) { + __dbj_throw(jenv, result, NULL, NULL, NULL); + } + + jresult = (jint)result; + __dbj_dbt_release(jenv, jarg2, arg2, &ldbt2); + return jresult; +} + + SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1abort0(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { struct DbTxn *arg1 = (struct DbTxn *) 0 ; db_ret_t result; diff --git a/lang/java/libdb_java/java_callbacks.i b/lang/java/libdb_java/java_callbacks.i index 6c3805dc..cee83795 100644 --- a/lang/java/libdb_java/java_callbacks.i +++ b/lang/java/libdb_java/java_callbacks.i @@ -174,6 +174,10 @@ static void __dbj_event_notify(DB_ENV *dbenv, u_int32_t event_id, void * info) (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, panic_event_notify_method); break; + case DB_EVENT_REP_AUTOTAKEOVER_FAILED: + (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, + dbenv_class, rep_autotakeover_failed_event_notify_method); + break; case DB_EVENT_REP_CLIENT: (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_client_event_notify_method); @@ -206,6 +210,10 @@ static void __dbj_event_notify(DB_ENV *dbenv, u_int32_t event_id, void * info) (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_init_done_event_notify_method); break; + case DB_EVENT_REP_INQUEUE_FULL: + (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, + dbenv_class, rep_inqueue_full_event_notify_method); + break; case DB_EVENT_REP_JOIN_FAILURE: (*jenv)->CallNonvirtualVoidMethod(jenv, jdbenv, dbenv_class, rep_join_failure_event_notify_method); @@ -646,8 +654,11 @@ err: if (dbt1->app_data == NULL) return (ret); } -static int __dbj_bt_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_bt_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { + if (locp != NULL) + locp = NULL; return __dbj_am_compare(db, dbt1, dbt2, bt_compare_method); } @@ -853,7 +864,8 @@ err: if (dbt1->app_data == NULL) { return (ret); } -static int __dbj_dup_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_dup_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { int detach; JNIEnv *jenv = __dbj_get_jnienv(&detach); @@ -861,6 +873,8 @@ static int __dbj_dup_compare(DB *db, const DBT *dbt1, const DBT *dbt2) jbyteArray jdbtarr1, jdbtarr2; int ret; + if (locp != NULL) + locp = NULL; if (jdb == NULL) return (EINVAL); @@ -906,8 +920,11 @@ static void __dbj_db_feedback(DB *db, int opcode, int percent) __dbj_detach(); } -static int __dbj_h_compare(DB *db, const DBT *dbt1, const DBT *dbt2) +static int __dbj_h_compare(DB *db, + const DBT *dbt1, const DBT *dbt2, size_t *locp) { + if (locp != NULL) + locp = NULL; return __dbj_am_compare(db, dbt1, dbt2, h_compare_method); } @@ -1051,6 +1068,40 @@ err: if (detach) __dbj_detach(); return (ret); } + +static int __dbj_rep_view(DB_ENV *dbenv, const char *name, int *result, u_int32_t flags) { + int detach; + JNIEnv *jenv = __dbj_get_jnienv(&detach); + jobject jdbenv = (jobject)DB_ENV_INTERNAL(dbenv); + jobject jname; + jboolean jresult; + int ret; + + if (jdbenv == NULL) { + ret = EINVAL; + goto err; + } + + jname = (*jenv)->NewStringUTF(jenv, name); + + jresult = (*jenv)->CallNonvirtualBooleanMethod(jenv, jdbenv, dbenv_class, rep_view_method, jname, flags); + + if ((*jenv)->ExceptionOccurred(jenv)) { + /* The exception will be thrown, so this could be any error. */ + ret = EINVAL; + goto err; + } + + ret = 0; + if (jresult == JNI_FALSE) + *result = 0; + else + *result = 1; + +err: if (detach) + __dbj_detach(); + return (ret); +} %} JAVA_CALLBACK(int (*backup_close_fcn)(DB_ENV *, @@ -1098,7 +1149,7 @@ JAVA_CALLBACK(int (*callback)(DB *, const DBT *, DBT *, const DBT *, int *), JAVA_CALLBACK(int (*db_append_recno_fcn)(DB *, DBT *, db_recno_t), com.sleepycat.db.RecordNumberAppender, append_recno) -JAVA_CALLBACK(int (*bt_compare_fcn)(DB *, const DBT *, const DBT *), +JAVA_CALLBACK(int (*bt_compare_fcn)(DB *, const DBT *, const DBT *, size_t *), java.util.Comparator, bt_compare) JAVA_CALLBACK(int (*bt_compress_fcn)(DB *, const DBT *, const DBT *, const DBT *, const DBT *, DBT *), @@ -1109,11 +1160,13 @@ JAVA_CALLBACK(u_int32_t (*db_partition_fcn)(DB *, DBT *), com.sleepycat.db.PartitionHandler, partition) JAVA_CALLBACK(size_t (*bt_prefix_fcn)(DB *, const DBT *, const DBT *), com.sleepycat.db.BtreePrefixCalculator, bt_prefix) -JAVA_CALLBACK(int (*dup_compare_fcn)(DB *, const DBT *, const DBT *), +JAVA_CALLBACK(int (*dup_compare_fcn)(DB *, const DBT *, const DBT *, size_t *), java.util.Comparator, dup_compare) JAVA_CALLBACK(void (*db_feedback_fcn)(DB *, int, int), com.sleepycat.db.FeedbackHandler, db_feedback) -JAVA_CALLBACK(int (*h_compare_fcn)(DB *, const DBT *, const DBT *), +JAVA_CALLBACK(int (*h_compare_fcn)(DB *, const DBT *, const DBT *, size_t *), java.util.Comparator, h_compare) JAVA_CALLBACK(u_int32_t (*h_hash_fcn)(DB *, const void *, u_int32_t), com.sleepycat.db.Hasher, h_hash) +JAVA_CALLBACK(int (*rep_view_fcn)(DB_ENV *, const char *, int *, u_int32_t), + com.sleepycat.db.ReplicationViewHandler, rep_view); diff --git a/lang/java/libdb_java/java_except.i b/lang/java/libdb_java/java_except.i index 2105940b..d0e080c8 100644 --- a/lang/java/libdb_java/java_except.i +++ b/lang/java/libdb_java/java_except.i @@ -92,6 +92,10 @@ static jthrowable __dbj_get_except(JNIEnv *jenv, return (jthrowable)(*jenv)->NewObject(jenv, heapfullex_class, heapfullex_construct, jmsg, ret, jdbenv); + case DB_META_CHKSUM_FAIL: + return (jthrowable)(*jenv)->NewObject(jenv, metachkfailex_class, + metachkfailex_construct, jmsg, ret, jdbenv); + case DB_REP_DUPMASTER: return (jthrowable)(*jenv)->NewObject(jenv, repdupmasterex_class, repdupmasterex_construct, diff --git a/lang/java/libdb_java/java_stat_auto.c b/lang/java/libdb_java/java_stat_auto.c index a17335f9..0d6d2068 100644 --- a/lang/java/libdb_java/java_stat_auto.c +++ b/lang/java/libdb_java/java_stat_auto.c @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ static int __dbj_fill_bt_stat(JNIEnv *jnienv, jobject jobj, struct __db_bt_stat *statp) { @@ -16,6 +16,7 @@ static int __dbj_fill_bt_stat(JNIEnv *jnienv, JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_pagecnt_fid, statp, bt_pagecnt); JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_pagesize_fid, statp, bt_pagesize); JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_minkey_fid, statp, bt_minkey); + JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_nblobs_fid, statp, bt_nblobs); JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_re_len_fid, statp, bt_re_len); JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_re_pad_fid, statp, bt_re_pad); JAVADB_STAT_INT(jnienv, jobj, bt_stat_bt_levels_fid, statp, bt_levels); @@ -52,6 +53,7 @@ static int __dbj_fill_h_stat(JNIEnv *jnienv, JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_metaflags_fid, statp, hash_metaflags); JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_nkeys_fid, statp, hash_nkeys); JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_ndata_fid, statp, hash_ndata); + JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_nblobs_fid, statp, hash_nblobs); JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_pagecnt_fid, statp, hash_pagecnt); JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_pagesize_fid, statp, hash_pagesize); JAVADB_STAT_INT(jnienv, jobj, h_stat_hash_ffactor_fid, statp, hash_ffactor); @@ -71,6 +73,7 @@ static int __dbj_fill_heap_stat(JNIEnv *jnienv, JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_magic_fid, statp, heap_magic); JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_version_fid, statp, heap_version); JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_metaflags_fid, statp, heap_metaflags); + JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_nblobs_fid, statp, heap_nblobs); JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_nrecs_fid, statp, heap_nrecs); JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_pagecnt_fid, statp, heap_pagecnt); JAVADB_STAT_INT(jnienv, jobj, heap_stat_heap_pagesize_fid, statp, heap_pagesize); @@ -127,6 +130,8 @@ static int __dbj_fill_lock_stat(JNIEnv *jnienv, JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_lockers_nowait_fid, statp, st_lockers_nowait); JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_region_wait_fid, statp, st_region_wait); JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_region_nowait_fid, statp, st_region_nowait); + JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_nlockers_hit_fid, statp, st_nlockers_hit); + JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_nlockers_reused_fid, statp, st_nlockers_reused); JAVADB_STAT_INT(jnienv, jobj, lock_stat_st_hash_len_fid, statp, st_hash_len); JAVADB_STAT_LONG(jnienv, jobj, lock_stat_st_regsize_fid, statp, st_regsize); return (0); @@ -211,6 +216,7 @@ static int __dbj_fill_mpool_stat(JNIEnv *jnienv, JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_mvcc_frozen_fid, statp, st_mvcc_frozen); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_mvcc_thawed_fid, statp, st_mvcc_thawed); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_mvcc_freed_fid, statp, st_mvcc_freed); + JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_mvcc_reused_fid, statp, st_mvcc_reused); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_alloc_fid, statp, st_alloc); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_alloc_buckets_fid, statp, st_alloc_buckets); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_alloc_max_buckets_fid, statp, st_alloc_max_buckets); @@ -218,6 +224,8 @@ static int __dbj_fill_mpool_stat(JNIEnv *jnienv, JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_alloc_max_pages_fid, statp, st_alloc_max_pages); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_io_wait_fid, statp, st_io_wait); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_sync_interrupted_fid, statp, st_sync_interrupted); + JAVADB_STAT_INT(jnienv, jobj, mpool_stat_st_oddfsize_detect_fid, statp, st_oddfsize_detect); + JAVADB_STAT_INT(jnienv, jobj, mpool_stat_st_oddfsize_resolve_fid, statp, st_oddfsize_resolve); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_regsize_fid, statp, st_regsize); JAVADB_STAT_LONG(jnienv, jobj, mpool_stat_st_regmax_fid, statp, st_regmax); return (0); @@ -258,6 +266,7 @@ static int __dbj_fill_qam_stat(JNIEnv *jnienv, static int __dbj_fill_rep_stat(JNIEnv *jnienv, jobject jobj, struct __db_rep_stat *statp) { JAVADB_STAT_INT(jnienv, jobj, rep_stat_st_startup_complete_fid, statp, st_startup_complete); + JAVADB_STAT_INT(jnienv, jobj, rep_stat_st_view_fid, statp, st_view); JAVADB_STAT_LONG(jnienv, jobj, rep_stat_st_log_queued_fid, statp, st_log_queued); JAVADB_STAT_INT(jnienv, jobj, rep_stat_st_status_fid, statp, st_status); JAVADB_STAT_LSN(jnienv, jobj, rep_stat_st_next_lsn_fid, statp, st_next_lsn); @@ -325,10 +334,17 @@ static int __dbj_fill_repmgr_stat(JNIEnv *jnienv, JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_perm_failed_fid, statp, st_perm_failed); JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_msgs_queued_fid, statp, st_msgs_queued); JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_msgs_dropped_fid, statp, st_msgs_dropped); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_incoming_queue_gbytes_fid, statp, st_incoming_queue_gbytes); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_incoming_queue_bytes_fid, statp, st_incoming_queue_bytes); + JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_incoming_msgs_dropped_fid, statp, st_incoming_msgs_dropped); JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_connection_drop_fid, statp, st_connection_drop); JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_connect_fail_fid, statp, st_connect_fail); - JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_elect_threads_fid, statp, st_elect_threads); - JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_max_elect_threads_fid, statp, st_max_elect_threads); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_elect_threads_fid, statp, st_elect_threads); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_max_elect_threads_fid, statp, st_max_elect_threads); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_site_participants_fid, statp, st_site_participants); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_site_total_fid, statp, st_site_total); + JAVADB_STAT_INT(jnienv, jobj, repmgr_stat_st_site_views_fid, statp, st_site_views); + JAVADB_STAT_LONG(jnienv, jobj, repmgr_stat_st_takeovers_fid, statp, st_takeovers); return (0); } static int __dbj_fill_seq_stat(JNIEnv *jnienv, diff --git a/lang/java/libdb_java/java_typemaps.i b/lang/java/libdb_java/java_typemaps.i index 31aacede..48baa306 100644 --- a/lang/java/libdb_java/java_typemaps.i +++ b/lang/java/libdb_java/java_typemaps.i @@ -69,6 +69,7 @@ struct __db_repmgr_sites { #define DbMpoolFile __db_mpoolfile #define DbSequence __db_sequence #define DbSite __db_site +#define DbStream __db_stream #define DbTxn __db_txn /* Suppress a compilation warning for an unused symbol */ @@ -91,6 +92,11 @@ typedef struct __dbt_locked { jsize array_len; } DBT_LOCKED; +struct __dbt_arr { + DBT *arr_ptr; + int len; +}; + static int __dbj_dbt_memcopy(DBT *dbt, u_int32_t offset, void *buf, u_int32_t size, u_int32_t flags) { DBT_LOCKED *ldbt = dbt->app_data; JNIEnv *jenv = ldbt->jenv; @@ -305,16 +311,150 @@ static void __dbj_dbt_release( return $null; /* An exception will be pending. */ }%} -/* Special cases for DBTs that may be null: DbEnv.rep_start, Db.compact Db.set_partition */ +/* Special cases for DBTs that may be null: DbEnv.rep_start, Db.compact */ %typemap(in) DBT *data_or_null (DBT_LOCKED ldbt) %{ if (__dbj_dbt_copyin(jenv, &ldbt, &$1, $input, 1) != 0) { return $null; /* An exception will be pending. */ }%} -%apply DBT *data_or_null {DBT *cdata, DBT *start, DBT *stop, DBT *end, DBT *db_put_data, DBT *keys}; +%apply DBT *data_or_null {DBT *cdata, DBT *start, DBT *stop, DBT *end, DBT *db_put_data}; %typemap(freearg) DBT * %{ __dbj_dbt_release(jenv, $input, $1, &ldbt$argnum); %} +/* Special case for Db.set_partition. */ +%typemap(in) DBT *keys { + DBT_LOCKED lresult; + DBT *dbt; + void *ptr, *retdata; + int cnt, i, ret; + u_int32_t retlen; + + if ($input == NULL) + $1 = NULL; + else { + /* Copy the DBT from Java to C. */ + if ((ret = __dbj_dbt_copyin(jenv, + &lresult, &dbt, $input, 0)) != 0) + /* An exception will be pending. */ + return $null; + + /* Get the number of DBT from the bulk buffer. */ + DB_MULTIPLE_INIT(ptr, dbt); + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + cnt = 0; + while (ptr != NULL) { + cnt++; + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + } + + /* Make an array of DBTs. */ + if ((ret = __os_malloc(NULL, + (cnt + 1) * sizeof(DBT), &$1)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + memset($1, 0, (cnt + 1) * sizeof(DBT)); + /* + * Save the key array size in the last entry so that it can + * be used later when free the key array and mark its flags + * as DB_DBT_BULK which is an internal flag that can't be + * passed by users. The last entry will not be read by the C + * call __partition_set since it only reads the first cnt + * DBTs from the key array. + */ + $1[cnt].size = sizeof(int); + $1[cnt].data = &cnt; + $1[cnt].flags = DB_DBT_BULK; + DB_MULTIPLE_INIT(ptr, dbt); + for (i = 0; i < cnt; i++) { + DB_MULTIPLE_NEXT(ptr, dbt, retdata, retlen); + if (retlen != 0) { + /* + * If there's data, we need to take a copy + * of it. + */ + $1[i].size = retlen; + if ((ret = __os_malloc(NULL, + $1[i].size, &$1[i].data)) != 0) { + __dbj_throw(jenv, + ret, NULL, NULL, NULL); + goto err; + } + memcpy($1[i].data, retdata, retlen); + } + } + +err: if (ret != 0) { + if ($1 != NULL) { + for (i = 0; i < cnt; i++) + __os_free(NULL, $1[i].data); + __os_free(NULL, $1); + } + return $null; + } + } +} + +%typemap(freearg) DBT *keys %{ +{ + int cnt, i; + + if ($1 != NULL) { + /* Get the array size. */ + cnt = 0; + while ($1[cnt].flags != DB_DBT_BULK) + cnt++; + for (i = 0; i < cnt; i++) + __os_free(NULL, $1[i].data); + __os_free(NULL, $1); + } +} +%} + +JAVA_TYPEMAP(struct __dbt_arr, com.sleepycat.db.DatabaseEntry, jobject) +%typemap(out) struct __dbt_arr { + DBT *dbt; + void *ptr; + int i, ret; + u_int32_t buflen; + + if ($1.arr_ptr == NULL || $1.len <= 0) + $result = NULL; + else { + /* Allocate the bulk buffer and make the bulk DBT. */ + for (i = 0, buflen = 0; i < $1.len; i++) + buflen += $1.arr_ptr[i].size * sizeof(u_int32_t); + buflen += ($1.len * 2 + 1) * sizeof(u_int32_t); + if ((ret = __os_malloc(NULL, sizeof(DBT), &dbt)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + if ((ret = __os_malloc(NULL, buflen, &dbt->data)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + goto err; + } + dbt->size = dbt->ulen = buflen; + DB_MULTIPLE_INIT(ptr, dbt); + for (i = 0; i < $1.len; i++) + DB_MULTIPLE_WRITE_NEXT(ptr, dbt, + $1.arr_ptr[i].data, $1.arr_ptr[i].size); + + /* Map a bulk DBT into a DatabaseEntry. */ + $result = (*jenv)->NewObject(jenv, dbt_class, dbt_construct); + __dbj_dbt_copyout(jenv, dbt, NULL, $result); + if ($result == NULL) + goto err; + +err: if (dbt != NULL) { + if (dbt->data != NULL) + __os_free(NULL, dbt->data); + __os_free(NULL, dbt); + } + if (ret != 0 || $result == NULL) + return $null; + } +} + /* DB_TXN_TOKEN handling */ JAVA_TYPEMAP(DB_TXN_TOKEN *, byte[], jobject) @@ -331,13 +471,13 @@ JAVA_TYPEMAP(DB_TXN_TOKEN *, byte[], jobject) $1 = NULL; } else { $1 = &token; - (*jenv)->GetByteArrayRegion(jenv, (jbyteArray)$input, 0, DB_TXN_TOKEN_SIZE, $1->buf); + (*jenv)->GetByteArrayRegion(jenv, (jbyteArray)$input, 0, DB_TXN_TOKEN_SIZE, (jbyte *)$1->buf); } %} %typemap(out) DB_TXN_TOKEN * %{ if ($input != NULL) { - (*jenv)->SetByteArrayRegion(jenv, (jbyteArray)$input, 0, DB_TXN_TOKEN_SIZE, $1->buf); + (*jenv)->SetByteArrayRegion(jenv, (jbyteArray)$input, 0, DB_TXN_TOKEN_SIZE, (jbyte *)$1->buf); } %} @@ -392,7 +532,7 @@ JAVA_TYPEMAP(u_int *, long, jlong) %} %typemap(in) u_int %{ - $1 = $input; + $1 = (u_int)$input; %} JAVA_TYPEMAP(DB_KEY_RANGE *, com.sleepycat.db.KeyRange, jobject) @@ -481,6 +621,48 @@ JAVA_TYPEMAP(char **, String[], jobjectArray) } } +%define STRING_ARRAY_IN + int i, ret; + size_t sz; + + size = (*jenv)->GetArrayLength(jenv, $input); + sz = (size_t)(size + 1) * sizeof(char *); + if ((ret = __os_malloc(NULL, sz, &$1)) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + return $null; + } + /* Make a copy of each string. */ + for (i = 0; i < size; i++) { + jstring j_string = (jstring)(*jenv)->GetObjectArrayElement(jenv, $input, i); + const char * c_string = (*jenv)->GetStringUTFChars(jenv, j_string, 0); + sz = strlen(c_string) + 1; + if ((ret = __os_malloc(NULL, sz, &$1[i])) != 0) { + __dbj_throw(jenv, ret, NULL, NULL, NULL); + return $null; + } + strcpy($1[i], c_string); + (*jenv)->ReleaseStringUTFChars(jenv, j_string, c_string); + (*jenv)->DeleteLocalRef(jenv, j_string); + } + $1[i] = 0; +%enddef + +/* This cleans up the memory we malloc'd before the function call. */ +%typemap(freearg) char ** { + int i; + for (i = 0; i < size$argnum-1; i++) + __os_free(NULL, $1[i]); + __os_free(NULL, $1); +} + +%typemap(in) char ** (jint size) { + STRING_ARRAY_IN +} + +%typemap(in) const char ** (jint size) { + STRING_ARRAY_IN +} + JAVA_TYPEMAP(char **hostp, String, jobjectArray) JAVA_TYPEMAP(struct __db_lk_conflicts, byte[][], jobjectArray) @@ -834,11 +1016,14 @@ SWIGEXPORT void JNICALL Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1commit(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { struct DbTxn *txn = (struct DbTxn *) 0 ; + DB_ENV *dbenv = (DB_ENV *) 0 ; + DB_REP_STAT *rep_stat = (DB_REP_STAT *) 0 ; ENV *env = (ENV *) 0 ; u_int32_t flags; DB_TXN_TOKEN token; db_ret_t result; db_ret_t result1; + db_ret_t result2; int is_nested, is_logging_enabled, is_rep_client, commit_token_enabled; (void)jcls; @@ -860,11 +1045,22 @@ Java_com_sleepycat_db_internal_db_1javaJNI_DbTxn_1commit(JNIEnv *jenv, * client node. */ env = txn->mgrp->env; + dbenv = env->dbenv; is_nested = (txn->parent != NULL); is_logging_enabled = env->lg_handle != NULL; - is_rep_client = (env->rep_handle != NULL && - env->rep_handle->region != NULL && - F_ISSET((env->rep_handle->region), REP_F_CLIENT)); + /* + * It is an illegal configuration to enable Java and disable statistics + * or enable the small build, so Java should always have access to the + * stat function. + */ + is_rep_client = 0; + if (env->rep_handle != NULL && env->rep_handle->region != NULL) { + result2 = dbenv->rep_stat(dbenv, &rep_stat, 0); + if (DB_RETOK_STD(result2)) { + is_rep_client = (rep_stat->st_status == DB_REP_CLIENT); + free(rep_stat); + } + } commit_token_enabled = (!is_nested && is_logging_enabled && !is_rep_client); if (commit_token_enabled) { diff --git a/lang/java/libdb_java/java_util.i b/lang/java/libdb_java/java_util.i index 62855776..3273a0f9 100644 --- a/lang/java/libdb_java/java_util.i +++ b/lang/java/libdb_java/java_util.i @@ -77,7 +77,7 @@ static int __dbj_throw(JNIEnv *jenv, static JavaVM *javavm; static jclass db_class, dbc_class, dbenv_class, dbt_class, dblsn_class; -static jclass dbpreplist_class, dbtxn_class; +static jclass dbpreplist_class, dbstream_class, dbtxn_class; static jclass keyrange_class; static jclass bt_stat_class, compact_class, h_stat_class, heap_stat_class; static jclass lock_stat_class, log_stat_class, mpool_stat_class, mpool_fstat_class; @@ -87,7 +87,7 @@ static jclass seq_stat_class, txn_stat_class; static jclass txn_active_class; static jclass lock_class, lockreq_class; static jclass dbex_class, deadex_class, heapfullex_class, lockex_class, memex_class; -static jclass repdupmasterex_class, rephandledeadex_class; +static jclass metachkfailex_class, repdupmasterex_class, rephandledeadex_class; static jclass repholdelectionex_class, repjoinfailex_class; static jclass repleaseexpiredex_class; static jclass replockoutex_class, repunavailex_class; @@ -99,6 +99,7 @@ static jfieldID dbc_cptr_fid; static jfieldID dblsn_file_fid, dblsn_offset_fid; static jfieldID dbt_data_fid, dbt_data_nio_fid, dbt_size_fid, dbt_ulen_fid; static jfieldID dbt_dlen_fid, dbt_doff_fid, dbt_flags_fid, dbt_offset_fid; +static jfieldID dbstream_cptr_fid; static jfieldID kr_less_fid, kr_equal_fid, kr_greater_fid; static jfieldID lock_cptr_fid; static jfieldID lockreq_op_fid, lockreq_modeflag_fid, lockreq_timeout_fid; @@ -115,6 +116,7 @@ static jfieldID bt_stat_bt_ndata_fid; static jfieldID bt_stat_bt_pagecnt_fid; static jfieldID bt_stat_bt_pagesize_fid; static jfieldID bt_stat_bt_minkey_fid; +static jfieldID bt_stat_bt_nblobs_fid; static jfieldID bt_stat_bt_re_len_fid; static jfieldID bt_stat_bt_re_pad_fid; static jfieldID bt_stat_bt_levels_fid; @@ -143,6 +145,7 @@ static jfieldID h_stat_hash_version_fid; static jfieldID h_stat_hash_metaflags_fid; static jfieldID h_stat_hash_nkeys_fid; static jfieldID h_stat_hash_ndata_fid; +static jfieldID h_stat_hash_nblobs_fid; static jfieldID h_stat_hash_pagecnt_fid; static jfieldID h_stat_hash_pagesize_fid; static jfieldID h_stat_hash_ffactor_fid; @@ -158,6 +161,7 @@ static jfieldID h_stat_hash_dup_free_fid; static jfieldID heap_stat_heap_magic_fid; static jfieldID heap_stat_heap_version_fid; static jfieldID heap_stat_heap_metaflags_fid; +static jfieldID heap_stat_heap_nblobs_fid; static jfieldID heap_stat_heap_nrecs_fid; static jfieldID heap_stat_heap_pagecnt_fid; static jfieldID heap_stat_heap_pagesize_fid; @@ -210,6 +214,8 @@ static jfieldID lock_stat_st_lockers_wait_fid; static jfieldID lock_stat_st_lockers_nowait_fid; static jfieldID lock_stat_st_region_wait_fid; static jfieldID lock_stat_st_region_nowait_fid; +static jfieldID lock_stat_st_nlockers_hit_fid; +static jfieldID lock_stat_st_nlockers_reused_fid; static jfieldID lock_stat_st_hash_len_fid; static jfieldID lock_stat_st_regsize_fid; static jfieldID log_stat_st_magic_fid; @@ -282,6 +288,7 @@ static jfieldID mpool_stat_st_region_wait_fid; static jfieldID mpool_stat_st_mvcc_frozen_fid; static jfieldID mpool_stat_st_mvcc_thawed_fid; static jfieldID mpool_stat_st_mvcc_freed_fid; +static jfieldID mpool_stat_st_mvcc_reused_fid; static jfieldID mpool_stat_st_alloc_fid; static jfieldID mpool_stat_st_alloc_buckets_fid; static jfieldID mpool_stat_st_alloc_max_buckets_fid; @@ -289,6 +296,8 @@ static jfieldID mpool_stat_st_alloc_pages_fid; static jfieldID mpool_stat_st_alloc_max_pages_fid; static jfieldID mpool_stat_st_io_wait_fid; static jfieldID mpool_stat_st_sync_interrupted_fid; +static jfieldID mpool_stat_st_oddfsize_detect_fid; +static jfieldID mpool_stat_st_oddfsize_resolve_fid; static jfieldID mpool_stat_st_regsize_fid; static jfieldID mpool_stat_st_regmax_fid; static jfieldID mutex_stat_st_mutex_align_fid; @@ -317,6 +326,7 @@ static jfieldID qam_stat_qs_pgfree_fid; static jfieldID qam_stat_qs_first_recno_fid; static jfieldID qam_stat_qs_cur_recno_fid; static jfieldID rep_stat_st_startup_complete_fid; +static jfieldID rep_stat_st_view_fid; static jfieldID rep_stat_st_log_queued_fid; static jfieldID rep_stat_st_status_fid; static jfieldID rep_stat_st_next_lsn_fid; @@ -380,10 +390,17 @@ static jfieldID rep_stat_st_max_lease_usec_fid; static jfieldID repmgr_stat_st_perm_failed_fid; static jfieldID repmgr_stat_st_msgs_queued_fid; static jfieldID repmgr_stat_st_msgs_dropped_fid; +static jfieldID repmgr_stat_st_incoming_queue_gbytes_fid; +static jfieldID repmgr_stat_st_incoming_queue_bytes_fid; +static jfieldID repmgr_stat_st_incoming_msgs_dropped_fid; static jfieldID repmgr_stat_st_connection_drop_fid; static jfieldID repmgr_stat_st_connect_fail_fid; static jfieldID repmgr_stat_st_elect_threads_fid; static jfieldID repmgr_stat_st_max_elect_threads_fid; +static jfieldID repmgr_stat_st_site_participants_fid; +static jfieldID repmgr_stat_st_site_total_fid; +static jfieldID repmgr_stat_st_site_views_fid; +static jfieldID repmgr_stat_st_takeovers_fid; static jfieldID seq_stat_st_wait_fid; static jfieldID seq_stat_st_nowait_fid; static jfieldID seq_stat_st_current_fid; @@ -431,7 +448,8 @@ static jmethodID rep_stat_construct, repmgr_stat_construct, seq_stat_construct; static jmethodID txn_stat_construct, txn_active_construct; static jmethodID dbex_construct, deadex_construct, lockex_construct; static jmethodID heapfullex_construct, memex_construct, memex_update_method; -static jmethodID repdupmasterex_construct, rephandledeadex_construct; +static jmethodID metachkfailex_construct, repdupmasterex_construct; +static jmethodID rephandledeadex_construct; static jmethodID repholdelectionex_construct, repjoinfailex_construct; static jmethodID repmgr_siteinfo_construct, rephost_construct, repleaseexpiredex_construct; static jmethodID replockoutex_construct; @@ -443,7 +461,9 @@ static jmethodID lock_construct; static jmethodID app_dispatch_method, errcall_method, env_feedback_method; static jmethodID msgcall_method, paniccall_method, rep_transport_method; -static jmethodID panic_event_notify_method, rep_client_event_notify_method; +static jmethodID panic_event_notify_method; +static jmethodID rep_autotakeover_failed_event_notify_method; +static jmethodID rep_client_event_notify_method; static jmethodID rep_connect_broken_event_notify_method; static jmethodID rep_connect_established_event_notify_method; static jmethodID rep_connect_try_failed_event_notify_method; @@ -451,6 +471,7 @@ static jmethodID rep_dupmaster_event_notify_method; static jmethodID rep_elected_event_notify_method; static jmethodID rep_election_failed_event_notify_method; static jmethodID rep_init_done_event_notify_method; +static jmethodID rep_inqueue_full_event_notify_method; static jmethodID rep_join_failure_event_notify_method; static jmethodID rep_local_site_removed_notify_method; static jmethodID rep_master_event_notify_method; @@ -468,7 +489,7 @@ static jmethodID backup_write_method, bt_compare_method, bt_compress_method; static jmethodID bt_decompress_method, bt_prefix_method; static jmethodID db_feedback_method, dup_compare_method; static jmethodID foreignkey_nullify_method, h_compare_method, h_hash_method; -static jmethodID partition_method, seckey_create_method; +static jmethodID rep_view_method, partition_method, seckey_create_method; static jmethodID outputstream_write_method; @@ -482,6 +503,7 @@ const struct { { &dbt_class, DB_PKG "DatabaseEntry" }, { &dblsn_class, DB_PKG "LogSequenceNumber" }, { &dbpreplist_class, DB_PKG "PreparedTransaction" }, + { &dbstream_class, DB_PKG "internal/DbStream" }, { &dbtxn_class, DB_PKG "internal/DbTxn" }, { &bt_stat_class, DB_PKG "BtreeStats" }, @@ -509,6 +531,7 @@ const struct { { &heapfullex_class, DB_PKG "HeapFullException" }, { &lockex_class, DB_PKG "LockNotGrantedException" }, { &memex_class, DB_PKG "MemoryException" }, + { &metachkfailex_class, DB_PKG "MetaCheckSumFailException" }, { &repdupmasterex_class, DB_PKG "ReplicationDuplicateMasterException" }, { &rephandledeadex_class, DB_PKG "ReplicationHandleDeadException" }, { &repholdelectionex_class, DB_PKG "ReplicationHoldElectionException" }, @@ -540,6 +563,8 @@ const struct { { &dblsn_file_fid, &dblsn_class, "file", "I" }, { &dblsn_offset_fid, &dblsn_class, "offset", "I" }, + { &dbstream_cptr_fid, &dbstream_class, "swigCPtr", "J" }, + { &dbt_data_fid, &dbt_class, "data", "[B" }, { &dbt_data_nio_fid, &dbt_class, "data_nio", "Ljava/nio/ByteBuffer;" }, { &dbt_size_fid, &dbt_class, "size", "I" }, @@ -573,6 +598,7 @@ const struct { { &bt_stat_bt_pagecnt_fid, &bt_stat_class, "bt_pagecnt", "I" }, { &bt_stat_bt_pagesize_fid, &bt_stat_class, "bt_pagesize", "I" }, { &bt_stat_bt_minkey_fid, &bt_stat_class, "bt_minkey", "I" }, + { &bt_stat_bt_nblobs_fid, &bt_stat_class, "bt_nblobs", "I" }, { &bt_stat_bt_re_len_fid, &bt_stat_class, "bt_re_len", "I" }, { &bt_stat_bt_re_pad_fid, &bt_stat_class, "bt_re_pad", "I" }, { &bt_stat_bt_levels_fid, &bt_stat_class, "bt_levels", "I" }, @@ -601,6 +627,7 @@ const struct { { &h_stat_hash_metaflags_fid, &h_stat_class, "hash_metaflags", "I" }, { &h_stat_hash_nkeys_fid, &h_stat_class, "hash_nkeys", "I" }, { &h_stat_hash_ndata_fid, &h_stat_class, "hash_ndata", "I" }, + { &h_stat_hash_nblobs_fid, &h_stat_class, "hash_nblobs", "I" }, { &h_stat_hash_pagecnt_fid, &h_stat_class, "hash_pagecnt", "I" }, { &h_stat_hash_pagesize_fid, &h_stat_class, "hash_pagesize", "I" }, { &h_stat_hash_ffactor_fid, &h_stat_class, "hash_ffactor", "I" }, @@ -616,6 +643,7 @@ const struct { { &heap_stat_heap_magic_fid, &heap_stat_class, "heap_magic", "I" }, { &heap_stat_heap_version_fid, &heap_stat_class, "heap_version", "I" }, { &heap_stat_heap_metaflags_fid, &heap_stat_class, "heap_metaflags", "I" }, + { &heap_stat_heap_nblobs_fid, &heap_stat_class, "heap_nblobs", "I" }, { &heap_stat_heap_nrecs_fid, &heap_stat_class, "heap_nrecs", "I" }, { &heap_stat_heap_pagecnt_fid, &heap_stat_class, "heap_pagecnt", "I" }, { &heap_stat_heap_pagesize_fid, &heap_stat_class, "heap_pagesize", "I" }, @@ -668,6 +696,8 @@ const struct { { &lock_stat_st_lockers_nowait_fid, &lock_stat_class, "st_lockers_nowait", "J" }, { &lock_stat_st_region_wait_fid, &lock_stat_class, "st_region_wait", "J" }, { &lock_stat_st_region_nowait_fid, &lock_stat_class, "st_region_nowait", "J" }, + { &lock_stat_st_nlockers_hit_fid, &lock_stat_class, "st_nlockers_hit", "J" }, + { &lock_stat_st_nlockers_reused_fid, &lock_stat_class, "st_nlockers_reused", "J" }, { &lock_stat_st_hash_len_fid, &lock_stat_class, "st_hash_len", "I" }, { &lock_stat_st_regsize_fid, &lock_stat_class, "st_regsize", "J" }, { &log_stat_st_magic_fid, &log_stat_class, "st_magic", "I" }, @@ -740,6 +770,7 @@ const struct { { &mpool_stat_st_mvcc_frozen_fid, &mpool_stat_class, "st_mvcc_frozen", "J" }, { &mpool_stat_st_mvcc_thawed_fid, &mpool_stat_class, "st_mvcc_thawed", "J" }, { &mpool_stat_st_mvcc_freed_fid, &mpool_stat_class, "st_mvcc_freed", "J" }, + { &mpool_stat_st_mvcc_reused_fid, &mpool_stat_class, "st_mvcc_reused", "J" }, { &mpool_stat_st_alloc_fid, &mpool_stat_class, "st_alloc", "J" }, { &mpool_stat_st_alloc_buckets_fid, &mpool_stat_class, "st_alloc_buckets", "J" }, { &mpool_stat_st_alloc_max_buckets_fid, &mpool_stat_class, "st_alloc_max_buckets", "J" }, @@ -747,6 +778,8 @@ const struct { { &mpool_stat_st_alloc_max_pages_fid, &mpool_stat_class, "st_alloc_max_pages", "J" }, { &mpool_stat_st_io_wait_fid, &mpool_stat_class, "st_io_wait", "J" }, { &mpool_stat_st_sync_interrupted_fid, &mpool_stat_class, "st_sync_interrupted", "J" }, + { &mpool_stat_st_oddfsize_detect_fid, &mpool_stat_class, "st_oddfsize_detect", "I" }, + { &mpool_stat_st_oddfsize_resolve_fid, &mpool_stat_class, "st_oddfsize_resolve", "I" }, { &mpool_stat_st_regsize_fid, &mpool_stat_class, "st_regsize", "J" }, { &mpool_stat_st_regmax_fid, &mpool_stat_class, "st_regmax", "J" }, { &mutex_stat_st_mutex_align_fid, &mutex_stat_class, "st_mutex_align", "I" }, @@ -775,6 +808,7 @@ const struct { { &qam_stat_qs_first_recno_fid, &qam_stat_class, "qs_first_recno", "I" }, { &qam_stat_qs_cur_recno_fid, &qam_stat_class, "qs_cur_recno", "I" }, { &rep_stat_st_startup_complete_fid, &rep_stat_class, "st_startup_complete", "I" }, + { &rep_stat_st_view_fid, &rep_stat_class, "st_view", "I" }, { &rep_stat_st_log_queued_fid, &rep_stat_class, "st_log_queued", "J" }, { &rep_stat_st_status_fid, &rep_stat_class, "st_status", "I" }, { &rep_stat_st_next_lsn_fid, &rep_stat_class, "st_next_lsn", "L" DB_PKG "LogSequenceNumber;" }, @@ -838,10 +872,17 @@ const struct { { &repmgr_stat_st_perm_failed_fid, &repmgr_stat_class, "st_perm_failed", "J" }, { &repmgr_stat_st_msgs_queued_fid, &repmgr_stat_class, "st_msgs_queued", "J" }, { &repmgr_stat_st_msgs_dropped_fid, &repmgr_stat_class, "st_msgs_dropped", "J" }, + { &repmgr_stat_st_incoming_queue_gbytes_fid, &repmgr_stat_class, "st_incoming_queue_gbytes", "I" }, + { &repmgr_stat_st_incoming_queue_bytes_fid, &repmgr_stat_class, "st_incoming_queue_bytes", "I" }, + { &repmgr_stat_st_incoming_msgs_dropped_fid, &repmgr_stat_class, "st_incoming_msgs_dropped", "J" }, { &repmgr_stat_st_connection_drop_fid, &repmgr_stat_class, "st_connection_drop", "J" }, { &repmgr_stat_st_connect_fail_fid, &repmgr_stat_class, "st_connect_fail", "J" }, - { &repmgr_stat_st_elect_threads_fid, &repmgr_stat_class, "st_elect_threads", "J" }, - { &repmgr_stat_st_max_elect_threads_fid, &repmgr_stat_class, "st_max_elect_threads", "J" }, + { &repmgr_stat_st_elect_threads_fid, &repmgr_stat_class, "st_elect_threads", "I" }, + { &repmgr_stat_st_max_elect_threads_fid, &repmgr_stat_class, "st_max_elect_threads", "I" }, + { &repmgr_stat_st_site_participants_fid, &repmgr_stat_class, "st_site_participants", "I" }, + { &repmgr_stat_st_site_total_fid, &repmgr_stat_class, "st_site_total", "I" }, + { &repmgr_stat_st_site_views_fid, &repmgr_stat_class, "st_site_views", "I" }, + { &repmgr_stat_st_takeovers_fid, &repmgr_stat_class, "st_takeovers", "J" }, { &seq_stat_st_wait_fid, &seq_stat_class, "st_wait", "J" }, { &seq_stat_st_nowait_fid, &seq_stat_class, "st_nowait", "J" }, { &seq_stat_st_current_fid, &seq_stat_class, "st_current", "J" }, @@ -930,6 +971,8 @@ const struct { DB_PKG "internal/DbEnv;)V" }, { &memex_update_method, &memex_class, "updateDatabaseEntry", "(L" DB_PKG "DatabaseEntry;)V" }, + { &metachkfailex_construct, &metachkfailex_class, "<init>", + "(Ljava/lang/String;IL" DB_PKG "internal/DbEnv;)V" }, { &repdupmasterex_construct, &repdupmasterex_class, "<init>", "(Ljava/lang/String;IL" DB_PKG "internal/DbEnv;)V" }, { &rephandledeadex_construct, &rephandledeadex_class, "<init>", @@ -967,6 +1010,8 @@ const struct { "(III[B)I" }, { &panic_event_notify_method, &dbenv_class, "handle_panic_event_notify", "()V" }, + { &rep_autotakeover_failed_event_notify_method, &dbenv_class, + "handle_rep_autotakeover_failed_event_notify", "()V" }, { &rep_connect_broken_event_notify_method, &dbenv_class, "handle_rep_connect_broken_event_notify", "()V" }, { &rep_connect_established_event_notify_method, &dbenv_class, @@ -983,6 +1028,8 @@ const struct { "handle_rep_election_failed_event_notify" ,"()V" }, { &rep_init_done_event_notify_method, &dbenv_class, "handle_rep_init_done_event_notify" , "()V" }, + { &rep_inqueue_full_event_notify_method, &dbenv_class, + "handle_rep_inqueue_full_event_notify" , "()V" }, { &rep_join_failure_event_notify_method, &dbenv_class, "handle_rep_join_failure_event_notify" ,"()V" }, { &rep_master_event_notify_method, &dbenv_class, @@ -1045,6 +1092,8 @@ const struct { { &seckey_create_method, &db_class, "handle_seckey_create", "(L" DB_PKG "DatabaseEntry;L" DB_PKG "DatabaseEntry;)[L" DB_PKG "DatabaseEntry;" }, + {&rep_view_method, &dbenv_class, "handle_rep_view", + "(Ljava/lang/String;I)Z" }, { &outputstream_write_method, &outputstream_class, "write", "([BII)V" } }; @@ -1153,7 +1202,7 @@ static void __dbj_detach() (void)(*javavm)->DetachCurrentThread(javavm); } -static jobject __dbj_wrap_DB_LSN(JNIEnv *jenv, DB_LSN *lsn) +static jobject __dbj_wrap_DB_LSN(JNIEnv *jenv, const DB_LSN *lsn) { return (*jenv)->NewObject(jenv, dblsn_class, dblsn_construct, lsn->file, lsn->offset); diff --git a/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java b/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java index f2a09d61..9f562afb 100644 --- a/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java +++ b/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/EntityBinding.java b/lang/java/src/com/sleepycat/bind/EntityBinding.java index c1cca90b..3ee907d1 100644 --- a/lang/java/src/com/sleepycat/bind/EntityBinding.java +++ b/lang/java/src/com/sleepycat/bind/EntityBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/EntryBinding.java b/lang/java/src/com/sleepycat/bind/EntryBinding.java index 7c2947cd..12c4cd35 100644 --- a/lang/java/src/com/sleepycat/bind/EntryBinding.java +++ b/lang/java/src/com/sleepycat/bind/EntryBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java b/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java index 6e88b490..b057b9c7 100644 --- a/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java +++ b/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java b/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java index 1b82cb1a..fecc416f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java +++ b/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialBase.java b/lang/java/src/com/sleepycat/bind/serial/SerialBase.java index 4af4b300..7ed383fd 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialBase.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java index 04ab52b8..ea731a9f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialInput.java b/lang/java/src/com/sleepycat/bind/serial/SerialInput.java index 23e493e6..8ee813a3 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialInput.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java b/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java index a4113524..7e800a58 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java index bc3e3b6c..a04a04b0 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java index 350d8a1f..3c632d6d 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java b/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java index b751139e..1d66d94b 100644 --- a/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java +++ b/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java index ee618fa0..15512cd0 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java index 6f03b8ac..f059a759 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java index 0687d9ab..c7202049 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java index 23a97302..b571931f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java index 98fd1407..fb15d7cd 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java index ddb66093..83cc651a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java index daeede2a..d9afd62a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java b/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java index ee02d9c1..5704489d 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java b/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java index 8aaea1cd..968638d6 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java index 4032a860..e4456a24 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java b/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java index bc78ca2b..d2e2babd 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java index 5d19b657..877b6457 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java index b9a15f9f..1674b2f9 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java index a089a116..3907327e 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java +++ b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java index 9fb48079..9a6591aa 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java +++ b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java index e45b0980..72a2272a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java index c6989891..a84e3b5c 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java b/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java index 1ec33cfb..9be38578 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java index c5e4a2ea..5b732766 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java index 1de803bf..968296ff 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java index 671995aa..f863acb1 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java index 5e83166f..818ff127 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java index 0d91c471..f970d772 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java b/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java index be3b73cd..2523bdb3 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java b/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java index 30ecbb63..62cfc75d 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java index 2291c622..040ad4e8 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java b/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java index 33e65794..ce1d7a90 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java index ea78d4d0..96b73de3 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java index f9d6d838..87096f52 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java b/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java index 4ae0061c..2d3e7a8b 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java index d0c96ec0..31719f8f 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java index 8567f2a1..d3c33fb9 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java index 4f9826bd..c4ea0d98 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java index 1da91d7d..4ee81467 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/BaseIterator.java b/lang/java/src/com/sleepycat/collections/BaseIterator.java index 2a55a632..e794c310 100644 --- a/lang/java/src/com/sleepycat/collections/BaseIterator.java +++ b/lang/java/src/com/sleepycat/collections/BaseIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/BlockIterator.java b/lang/java/src/com/sleepycat/collections/BlockIterator.java index 60a3b3ba..26fc6c24 100644 --- a/lang/java/src/com/sleepycat/collections/BlockIterator.java +++ b/lang/java/src/com/sleepycat/collections/BlockIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/CurrentTransaction.java b/lang/java/src/com/sleepycat/collections/CurrentTransaction.java index 8119c264..15f8b89b 100644 --- a/lang/java/src/com/sleepycat/collections/CurrentTransaction.java +++ b/lang/java/src/com/sleepycat/collections/CurrentTransaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/DataCursor.java b/lang/java/src/com/sleepycat/collections/DataCursor.java index a4ac6cdd..b43e784a 100644 --- a/lang/java/src/com/sleepycat/collections/DataCursor.java +++ b/lang/java/src/com/sleepycat/collections/DataCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/DataView.java b/lang/java/src/com/sleepycat/collections/DataView.java index f410b442..c6c4e6a6 100644 --- a/lang/java/src/com/sleepycat/collections/DataView.java +++ b/lang/java/src/com/sleepycat/collections/DataView.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/MapEntryParameter.java b/lang/java/src/com/sleepycat/collections/MapEntryParameter.java index e5a3d644..2b906868 100644 --- a/lang/java/src/com/sleepycat/collections/MapEntryParameter.java +++ b/lang/java/src/com/sleepycat/collections/MapEntryParameter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/MyRangeCursor.java b/lang/java/src/com/sleepycat/collections/MyRangeCursor.java index c8e9498a..5141a69b 100644 --- a/lang/java/src/com/sleepycat/collections/MyRangeCursor.java +++ b/lang/java/src/com/sleepycat/collections/MyRangeCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java b/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java index 127d6064..76defe6c 100644 --- a/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java +++ b/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredCollection.java b/lang/java/src/com/sleepycat/collections/StoredCollection.java index 3dcfcb9b..026944e5 100644 --- a/lang/java/src/com/sleepycat/collections/StoredCollection.java +++ b/lang/java/src/com/sleepycat/collections/StoredCollection.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredCollections.java b/lang/java/src/com/sleepycat/collections/StoredCollections.java index d7bd4fec..42620e16 100644 --- a/lang/java/src/com/sleepycat/collections/StoredCollections.java +++ b/lang/java/src/com/sleepycat/collections/StoredCollections.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredContainer.java b/lang/java/src/com/sleepycat/collections/StoredContainer.java index b63ac0de..3cee5a02 100644 --- a/lang/java/src/com/sleepycat/collections/StoredContainer.java +++ b/lang/java/src/com/sleepycat/collections/StoredContainer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredEntrySet.java b/lang/java/src/com/sleepycat/collections/StoredEntrySet.java index 5134cb16..2c5103f9 100644 --- a/lang/java/src/com/sleepycat/collections/StoredEntrySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredEntrySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredIterator.java b/lang/java/src/com/sleepycat/collections/StoredIterator.java index fc35d005..29d24ff1 100644 --- a/lang/java/src/com/sleepycat/collections/StoredIterator.java +++ b/lang/java/src/com/sleepycat/collections/StoredIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredKeySet.java b/lang/java/src/com/sleepycat/collections/StoredKeySet.java index bc3864ad..c41aa87a 100644 --- a/lang/java/src/com/sleepycat/collections/StoredKeySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredKeySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredList.java b/lang/java/src/com/sleepycat/collections/StoredList.java index 6e35167a..490687fc 100644 --- a/lang/java/src/com/sleepycat/collections/StoredList.java +++ b/lang/java/src/com/sleepycat/collections/StoredList.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredMap.java b/lang/java/src/com/sleepycat/collections/StoredMap.java index 1e9449a1..7224718c 100644 --- a/lang/java/src/com/sleepycat/collections/StoredMap.java +++ b/lang/java/src/com/sleepycat/collections/StoredMap.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredMapEntry.java b/lang/java/src/com/sleepycat/collections/StoredMapEntry.java index 0d60def4..23ea3499 100644 --- a/lang/java/src/com/sleepycat/collections/StoredMapEntry.java +++ b/lang/java/src/com/sleepycat/collections/StoredMapEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java b/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java index 4569a48d..438fa661 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java b/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java index 006e76c7..96957d52 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedMap.java b/lang/java/src/com/sleepycat/collections/StoredSortedMap.java index 8c57a876..5f3350b2 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedMap.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedMap.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java b/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java index 5c1bd9a0..d257fc22 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredValueSet.java b/lang/java/src/com/sleepycat/collections/StoredValueSet.java index b8001b9a..99a93b71 100644 --- a/lang/java/src/com/sleepycat/collections/StoredValueSet.java +++ b/lang/java/src/com/sleepycat/collections/StoredValueSet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TransactionRunner.java b/lang/java/src/com/sleepycat/collections/TransactionRunner.java index 08d27e97..99399d01 100644 --- a/lang/java/src/com/sleepycat/collections/TransactionRunner.java +++ b/lang/java/src/com/sleepycat/collections/TransactionRunner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TransactionWorker.java b/lang/java/src/com/sleepycat/collections/TransactionWorker.java index 1cb47b1f..4aa1ec5f 100644 --- a/lang/java/src/com/sleepycat/collections/TransactionWorker.java +++ b/lang/java/src/com/sleepycat/collections/TransactionWorker.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java b/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java index c732eeab..cb27859a 100644 --- a/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java +++ b/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/package.html b/lang/java/src/com/sleepycat/collections/package.html index 57d82c7a..3298e1e1 100644 --- a/lang/java/src/com/sleepycat/collections/package.html +++ b/lang/java/src/com/sleepycat/collections/package.html @@ -4,7 +4,7 @@ See the file LICENSE for redistribution information. - Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2015 Oracle. All rights reserved. --> diff --git a/lang/java/src/com/sleepycat/compat/DbCompat.java b/lang/java/src/com/sleepycat/compat/DbCompat.java index 427810a2..da4d19c8 100644 --- a/lang/java/src/com/sleepycat/compat/DbCompat.java +++ b/lang/java/src/com/sleepycat/compat/DbCompat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BackupHandler.java b/lang/java/src/com/sleepycat/db/BackupHandler.java index 2d107d63..7e2f3ddb 100644 --- a/lang/java/src/com/sleepycat/db/BackupHandler.java +++ b/lang/java/src/com/sleepycat/db/BackupHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BackupOptions.java b/lang/java/src/com/sleepycat/db/BackupOptions.java index 3db723bc..ca1ebd93 100644 --- a/lang/java/src/com/sleepycat/db/BackupOptions.java +++ b/lang/java/src/com/sleepycat/db/BackupOptions.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreeCompressor.java b/lang/java/src/com/sleepycat/db/BtreeCompressor.java index d6c45851..6389c27c 100644 --- a/lang/java/src/com/sleepycat/db/BtreeCompressor.java +++ b/lang/java/src/com/sleepycat/db/BtreeCompressor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java b/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java index 4d8c0c76..fcb2c69a 100644 --- a/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java +++ b/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreeStats.java b/lang/java/src/com/sleepycat/db/BtreeStats.java index 27d6a089..abd83934 100644 --- a/lang/java/src/com/sleepycat/db/BtreeStats.java +++ b/lang/java/src/com/sleepycat/db/BtreeStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -114,6 +114,14 @@ public class BtreeStats extends DatabaseStats { return bt_minkey; } + private int bt_nblobs; + /** + The number of blob records. + */ + public int getNumBlobs() { + return bt_nblobs; + } + private int bt_re_len; /** The length of fixed-length records. @@ -265,6 +273,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi + "\n bt_pagecnt=" + bt_pagecnt + "\n bt_pagesize=" + bt_pagesize + "\n bt_minkey=" + bt_minkey + + "\n bt_nblobs=" + bt_nblobs + "\n bt_re_len=" + bt_re_len + "\n bt_re_pad=" + bt_re_pad + "\n bt_levels=" + bt_levels diff --git a/lang/java/src/com/sleepycat/db/CacheFile.java b/lang/java/src/com/sleepycat/db/CacheFile.java index b459974d..c7da1ae7 100644 --- a/lang/java/src/com/sleepycat/db/CacheFile.java +++ b/lang/java/src/com/sleepycat/db/CacheFile.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CacheFilePriority.java b/lang/java/src/com/sleepycat/db/CacheFilePriority.java index 1f4a3d2a..88923f66 100644 --- a/lang/java/src/com/sleepycat/db/CacheFilePriority.java +++ b/lang/java/src/com/sleepycat/db/CacheFilePriority.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CacheFileStats.java b/lang/java/src/com/sleepycat/db/CacheFileStats.java index 5748420f..82b30ba0 100644 --- a/lang/java/src/com/sleepycat/db/CacheFileStats.java +++ b/lang/java/src/com/sleepycat/db/CacheFileStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -73,7 +73,7 @@ public class CacheFileStats { } private long st_backup_spins; - /** TODO */ + /** Spins while trying to back up the file. */ public long getBackupSpins() { return st_backup_spins; } diff --git a/lang/java/src/com/sleepycat/db/CacheStats.java b/lang/java/src/com/sleepycat/db/CacheStats.java index c41fdab4..efe0ced1 100644 --- a/lang/java/src/com/sleepycat/db/CacheStats.java +++ b/lang/java/src/com/sleepycat/db/CacheStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -267,7 +267,7 @@ public class CacheStats { private long st_region_nowait; /** The number of times that a thread of control was able to obtain a - region lock without waiting. + cache region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; @@ -276,7 +276,7 @@ public class CacheStats { private long st_region_wait; /** The number of times that a thread of control was forced to wait - before obtaining a region lock. + before obtaining a cache region mutex. */ public long getRegionWait() { return st_region_wait; @@ -306,6 +306,14 @@ public class CacheStats { return st_mvcc_freed; } + private long st_mvcc_reused; + /** + Number of outdated intermediate versions reused. + */ + public long getMultiversionReused() { + return st_mvcc_reused; + } + private long st_alloc; /** Number of page allocations. @@ -362,6 +370,18 @@ public class CacheStats { return st_sync_interrupted; } + private int st_oddfsize_detect; + /** TODO */ + /* package */ int getOddfSizeDetect() { + return st_oddfsize_detect; + } + + private int st_oddfsize_resolve; + /** TODO */ + /* package */ int getOddfSizeResolve() { + return st_oddfsize_resolve; + } + private long st_regsize; /** Individual cache size. @@ -371,7 +391,7 @@ public class CacheStats { } private long st_regmax; - /** The max size of the mutex region size. */ + /** The maximum size, in bytes, of the mutex region. */ public long getRegmax() { return st_regmax; } @@ -417,6 +437,7 @@ public class CacheStats { + "\n st_mvcc_frozen=" + st_mvcc_frozen + "\n st_mvcc_thawed=" + st_mvcc_thawed + "\n st_mvcc_freed=" + st_mvcc_freed + + "\n st_mvcc_reused=" + st_mvcc_reused + "\n st_alloc=" + st_alloc + "\n st_alloc_buckets=" + st_alloc_buckets + "\n st_alloc_max_buckets=" + st_alloc_max_buckets diff --git a/lang/java/src/com/sleepycat/db/CheckpointConfig.java b/lang/java/src/com/sleepycat/db/CheckpointConfig.java index 7b69bad5..bd89238f 100644 --- a/lang/java/src/com/sleepycat/db/CheckpointConfig.java +++ b/lang/java/src/com/sleepycat/db/CheckpointConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CompactConfig.java b/lang/java/src/com/sleepycat/db/CompactConfig.java index 4909e89c..8332e569 100644 --- a/lang/java/src/com/sleepycat/db/CompactConfig.java +++ b/lang/java/src/com/sleepycat/db/CompactConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CompactStats.java b/lang/java/src/com/sleepycat/db/CompactStats.java index f084340c..84dee7da 100644 --- a/lang/java/src/com/sleepycat/db/CompactStats.java +++ b/lang/java/src/com/sleepycat/db/CompactStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -41,7 +41,9 @@ public class CompactStats { } private int compact_empty_buckets; - /** The number of empty hash buckets that were found the compaction phase. */ + /** + The number of empty hash buckets that were found the compaction phase. + */ public int getEmptyBuckets() { return compact_empty_buckets; } @@ -64,7 +66,8 @@ public class CompactStats { private int compact_levels; /** - The number of levels removed from the Btree or Recno database during the compaction phase. + The number of levels removed from the Btree or Recno database during the + compaction phase. */ public int getLevels() { return compact_levels; @@ -99,16 +102,12 @@ public class CompactStats { */ public String toString() { return "CompactStats:" - + "\n compact_fillpercent=" + compact_fillpercent - + "\n compact_timeout=" + compact_timeout - + "\n compact_pages=" + compact_pages + "\n compact_empty_buckets=" + compact_empty_buckets + "\n compact_pages_free=" + compact_pages_free + "\n compact_pages_examine=" + compact_pages_examine + "\n compact_levels=" + compact_levels + "\n compact_deadlock=" + compact_deadlock + "\n compact_pages_truncated=" + compact_pages_truncated - + "\n compact_truncate=" + compact_truncate ; } } diff --git a/lang/java/src/com/sleepycat/db/Cursor.java b/lang/java/src/com/sleepycat/db/Cursor.java index 56463a4b..7402a06a 100644 --- a/lang/java/src/com/sleepycat/db/Cursor.java +++ b/lang/java/src/com/sleepycat/db/Cursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -1202,4 +1202,24 @@ deadlock. dbc.set_priority(priority.getFlag()); } + + /** + Return a database stream pointing to a key/data pair where the data item + is a blob. + <p> + @param config + The database stream attributes. If null, default attributes are used. + <p> + @return + A database stream. + <p> + @throws DatabaseException if the data item is not a blob. + */ + public DatabaseStream openDatabaseStream(DatabaseStreamConfig config) + throws DatabaseException { + + return new DatabaseStream(this, DatabaseStreamConfig.checkNull( + config).openDatabaseStream(dbc), config); + } + } diff --git a/lang/java/src/com/sleepycat/db/CursorConfig.java b/lang/java/src/com/sleepycat/db/CursorConfig.java index 61465095..179c1bfe 100644 --- a/lang/java/src/com/sleepycat/db/CursorConfig.java +++ b/lang/java/src/com/sleepycat/db/CursorConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Database.java b/lang/java/src/com/sleepycat/db/Database.java index c0060300..059b9cb2 100644 --- a/lang/java/src/com/sleepycat/db/Database.java +++ b/lang/java/src/com/sleepycat/db/Database.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -365,6 +365,14 @@ it will be closed when the environment handle that owns the database handle is c DbConstants.DB_TXN_NOSYNC : 0) : 0); } + private java.io.File getBlobSubDir() + throws DatabaseException { + String blobDirStr = db.get_blob_sub_dir(); + if (blobDirStr != null) + return (new java.io.File(blobDirStr)); + return null; + } + /** Return the database's underlying file name. <p> @@ -1311,6 +1319,28 @@ from the {@link com.sleepycat.db.Environment#beginCDSGroup Environment.beginCDSG } /** + Print database statistics to a specified output channel (see the + setMsgfile() method for more information), or passed to an application + callback function (see the setMsgcall() method for more information). + <p> + @param config + The statistics returned; if null, default statistics are returned. + <p> + @return + A non-zero error value on failure and 0 on success. + <p> + @throws DeadlockException if the operation was selected to resolve a + deadlock. + <p> + @throws DatabaseException if a failure occurs. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return db.stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** <p> Remove the database specified by the file and database parameters. <p> @@ -1360,7 +1390,8 @@ The database to be removed. DatabaseConfig config) throws DatabaseException, java.io.FileNotFoundException { - final Db db = DatabaseConfig.checkNull(config).createDatabase(null); + final Db db = DatabaseConfig.DEFAULT.createDatabase(null); + DatabaseConfig.checkNull(config).configureDatabase(db, DatabaseConfig.DEFAULT); db.remove(fileName, databaseName, 0); } @@ -1637,7 +1668,26 @@ or failure. throws DatabaseException, java.io.FileNotFoundException { final Db db = DatabaseConfig.checkNull(dbConfig).createDatabase(null); + /* Configure db with dbConfig */ + dbConfig.configureDatabase(db, DatabaseConfig.DEFAULT); return db.verify(fileName, databaseName, dumpStream, VerifyConfig.checkNull(verifyConfig).getFlags()); } + + /** + Sets the path of a file to store statistical information. + <p> + @param file + The path of a file to store statistical information. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setMsgfile(java.io.File file) throws DatabaseException { + if (file != null) { + db.set_msgfile(file.toString()); + } + else { + db.set_msgfile(null); + } + } } diff --git a/lang/java/src/com/sleepycat/db/DatabaseConfig.java b/lang/java/src/com/sleepycat/db/DatabaseConfig.java index 76f54e24..bf8da94e 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseConfig.java +++ b/lang/java/src/com/sleepycat/db/DatabaseConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -36,6 +36,8 @@ public class DatabaseConfig implements Cloneable { /* Parameters */ private DatabaseType type = DatabaseType.UNKNOWN; private int mode = 0644; + private java.io.File blobDir = null; + private int blobThreshold = 0; private int btMinKey = 0; private int byteOrder = 0; private long cacheSize = 0L; @@ -48,6 +50,8 @@ public class DatabaseConfig implements Cloneable { private long heapSize = 0L; private int heapRegionSize = 0; private java.io.OutputStream messageStream = null; + private java.io.File msgfile = null; + private String msgfileStr = null; private Boolean noWaitDbExclusiveLock = null; private int pageSize = 0; private java.io.File[] partitionDirs = null; @@ -140,6 +144,70 @@ True if the {@link com.sleepycat.db.Environment#openDatabase Environment.openDat } /** + Sets the path of a directory where blobs are stored. + <p> + If the database is opened within an environment, this path setting is + ignored in + {@link com.sleepycat.db.Environment#openDatabase Environment.openDatabase}. + Use {@link com.sleepycat.db.Database#getConfig Database.getConfig} and + {@link com.sleepycat.db.DatabaseConfig#getBlobDir DatabaseConfig.getBlobDir} + to identify the current storage location of blobs after opening + the database. + <p> + This path can not be set after opening the database. + <p> + @param dir + The path of a directory where blobs are stored. + */ + public void setBlobDir(java.io.File dir) { + this.blobDir = dir; + } + + /** + Returns the path of a directory where blobs are stored. + <p> + @return + The path of a directory where blobs are stored. + */ + public java.io.File getBlobDir() { + return blobDir; + } + + /** + Set the size in bytes which is used to determine when a data item will be + stored as a blob. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob. + <p> + It is illegal to enable blob in the database which is configured + as in-memory database or with chksum, encryption, duplicates, sorted + duplicates, compression, multiversion concurrency control and + transactional read operations with degree 1 isolation. + <p> + This threshold value can not be set after opening the database. + <p> + @param value + The size in bytes which is used to determine when a data item will be + stored as a blob. If 0, blob will be never used by the database. + */ + public void setBlobThreshold(int value) { + this.blobThreshold = value; + } + + /** + Return the threshold value in bytes beyond which data items are + stored as blobs. + <p> + @return + The threshold value in bytes beyond which data items are + stored as blobs. If 0, blob is not used by the database. + */ + public int getBlobThreshold() { + return blobThreshold; + } + + /** By default, a byte by byte lexicographic comparison is used for btree keys. To customize the comparison, supply a different Comparator. @@ -1044,6 +1112,22 @@ The function to be called with an informational message. } /** +Sets the path of a file to store statistical information. +<p> +This method may be called at any time during the life of the application. +<p> +@param file +The path of a file to store statistical information. + */ + public void setMsgfile(java.io.File file) { + this.msgfile = file; + if (file != null) + this.msgfileStr = file.toString(); + else + this.msgfileStr = null; + } + + /** Set an OutputStream for displaying informational messages. <p> There are interfaces in the Berkeley DB library which either directly @@ -1323,10 +1407,30 @@ The number of partitions that will be created. <p> @param keys A MultipleDatabaseEntry that contains the boundary keys for partitioning. +<p> +@throws IllegalArgumentException if parts is not equal to the size of key array plus 1. */ public void setPartitionByRange(int parts, MultipleDataEntry keys) { + if (keys == null || keys.getSize() == 0) + this.partitionKeys = null; + else { + // Get the number of items from the input keys + MultipleDataEntry keysmulti = new MultipleDataEntry(); + keysmulti.setData(keys.getData()); + keysmulti.setUserBuffer(keys.getData().length, true); + DatabaseEntry keyElement = new DatabaseEntry(); + int cnt = 0; + while(keysmulti.next(keyElement)) + cnt++; + // Ensure the size of key array equal to parts minus 1 + if (cnt != (parts - 1)) + throw new IllegalArgumentException("parts!=(key number-1)."); + else if (cnt == 0) + this.partitionKeys = null; + else + this.partitionKeys = keys; + } this.partitionParts = parts; - this.partitionKeys = keys; } /** @@ -2265,6 +2369,10 @@ database has been opened. if (dbFlags != 0) db.set_flags(dbFlags); + if (db.get_env().wrapper == null && blobDir != oldConfig.blobDir) + db.set_blob_dir(blobDir.toString()); + if (blobThreshold != oldConfig.blobThreshold) + db.set_blob_threshold(blobThreshold, 0); if (btMinKey != oldConfig.btMinKey) db.set_bt_minkey(btMinKey); if (byteOrder != oldConfig.byteOrder) @@ -2289,6 +2397,8 @@ database has been opened. db.set_heap_regionsize(heapRegionSize); if (messageStream != oldConfig.messageStream) db.set_message_stream(messageStream); + if (msgfile != oldConfig.msgfile) + db.set_msgfile(msgfile.toString()); if (pageSize != oldConfig.pageSize) db.set_pagesize(pageSize); @@ -2372,6 +2482,10 @@ database has been opened. unsortedDuplicates = !sortedDuplicates && ((dbFlags & DbConstants.DB_DUP) != 0); transactionNotDurable = (dbFlags & DbConstants.DB_TXN_NOT_DURABLE) != 0; + String blobDirStr = db.get_blob_dir(); + if (blobDirStr != null) + blobDir = new java.io.File(blobDirStr); + blobThreshold = db.get_blob_threshold(); if (type == DatabaseType.BTREE) { btMinKey = db.get_bt_minkey(); } @@ -2391,6 +2505,9 @@ database has been opened. heapRegionSize = db.get_heap_regionsize(); } messageStream = db.get_message_stream(); + if (msgfileStr != null) + msgfile = new java.io.File(msgfileStr); + pageSize = db.get_pagesize(); // Not available by design password = ((dbFlags & DbConstants.DB_ENCRYPT) != 0) ? "" : null; diff --git a/lang/java/src/com/sleepycat/db/DatabaseEntry.java b/lang/java/src/com/sleepycat/db/DatabaseEntry.java index 015917d6..69dfcdb6 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseEntry.java +++ b/lang/java/src/com/sleepycat/db/DatabaseEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -212,6 +212,29 @@ public class DatabaseEntry { */ /** + Configure this DatabaseEntry to be stored as a blob. + <p> + @param blob + Whether this DatabaseEntry is configured to be stored as a blob. + */ + public void setBlob(final boolean blob) { + if (blob) + flags |= DbConstants.DB_DBT_BLOB; + else + flags &= ~DbConstants.DB_DBT_BLOB; + } + + /** + Return whether this DatabaseEntry is configured to be stored as a blob. + <p> + @return + Whether this DatabaseEntry is configured to be stored as a blob. + */ + public boolean getBlob() { + return (flags & DbConstants.DB_DBT_BLOB) != 0; + } + + /** Return the byte array. <p> For a DatabaseEntry that is used as an output parameter, the byte diff --git a/lang/java/src/com/sleepycat/db/DatabaseException.java b/lang/java/src/com/sleepycat/db/DatabaseException.java index 419dd3df..34188fce 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseException.java +++ b/lang/java/src/com/sleepycat/db/DatabaseException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DatabaseStats.java b/lang/java/src/com/sleepycat/db/DatabaseStats.java index dc3a42c0..5553bb93 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseStats.java +++ b/lang/java/src/com/sleepycat/db/DatabaseStats.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DatabaseStream.java b/lang/java/src/com/sleepycat/db/DatabaseStream.java new file mode 100644 index 00000000..add27405 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/DatabaseStream.java @@ -0,0 +1,159 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbStream; + +/** +A database stream. The database stream is used to access the blob. +<p> +Once the database stream close method has been called, the handle may not +be accessed again. +<p> +To obtain a database stream with default attributes: +<blockquote><pre> + DatabaseStream dbs = myCursor.openDatabaseStream(null); +</pre></blockquote> +To customize the attributes of a database stream, +use a DatabaseStreamConfig object. +<blockquote><pre> + DatabaseStreamConfig config = new DatabaseStreamConfig(); + config.setReadOnly(true); + DatabaseStream dbs = myCursor.openDatabaseStream(config); +</pre></blockquote> +*/ +public class DatabaseStream { + /* package */ DbStream dbs; + /* package */ Cursor cursor; + /* package */ DatabaseStreamConfig config; + + protected DatabaseStream( + final Cursor cursor, final DatabaseStreamConfig config) { + this.cursor = cursor; + this.config = config; + } + + DatabaseStream(final Cursor cursor, + final DbStream dbs, final DatabaseStreamConfig config) + throws DatabaseException { + + this.cursor = cursor; + this.dbs = dbs; + this.config = config; + } + + /** + Discard the database stream. + <p> + After the close method has been called, you cannot use the database stream + handle again. + <p> + It is recommended to always close all database stream handles immediately + after their use to release resources. + <p> + @throws DatabaseException if a failure occurs. + */ + public synchronized void close() + throws DatabaseException { + + if (dbs != null) { + try { + dbs.close(0); + } finally { + dbs = null; + } + } + } + + /** + Return this database stream configuration. + <p> + @return + This database stream configuration. + <p> + @throws DatabaseException if a failure occurs. + */ + public DatabaseStreamConfig getConfig() { + return config; + } + + /** + Return the {@link com.sleepycat.db.Cursor Cursor} handle associated + with this database stream. + <p> + @return + The cursor handle associated with this database stream. + */ + public Cursor getCursor() { + return cursor; + } + + /** + Read from the blob accessed by this database stream. + <p> + @throws IllegalArgumentException if a failure occurs. + <p> + @param data the data read from the blob + returned as output. Its byte array does not need to be initialized by the + caller. + <p> + @param offset the position in bytes in the blob where the reading starts. + <p> + @param size the number of bytes to read. + <p> + @return {@link com.sleepycat.db.OperationStatus#SUCCESS OperationStatus.SUCCESS} + if the operation succeeds. + <p> + @throws IllegalArgumentException if the operation fails. + <p> + @throws DatabaseException if a failure occurs. + */ + public OperationStatus read(final DatabaseEntry data, long offset, int size) + throws DatabaseException, IllegalArgumentException { + + return OperationStatus.fromInt( + dbs.read(data, offset, size, 0)); + } + + /** + Return the size in bytes of the blob accessed by the database stream. + <p> + @return + The size in bytes of the blob accessed by the database stream. + <p> + @throws DatabaseException if a failure occurs. + */ + public long size() + throws DatabaseException { + return dbs.size(0); + } + + /** + Write to the blob accessed by the database stream. + <p> + @param data the data {@link com.sleepycat.db.DatabaseEntry DatabaseEntry} + to write into the blob. + <p> + @param offset the position in bytes in the blob where the writing starts. + <p> + @return {@link com.sleepycat.db.OperationStatus#SUCCESS OperationStatus.SUCCESS} + if the operation succeeds. + <p> + @throws IllegalArgumentException if the operation fails. + <p> + @throws DatabaseException if a failure occurs. + */ + public OperationStatus write(final DatabaseEntry data, long offset) + throws DatabaseException, IllegalArgumentException { + + return OperationStatus.fromInt(dbs.write(data, offset, 0)); + } + +} diff --git a/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java b/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java new file mode 100644 index 00000000..f8f88033 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java @@ -0,0 +1,93 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbStream; +import com.sleepycat.db.internal.Dbc; + +/** +Specify the attributes of database stream. An instance created with the +default constructor is initialized with the system's default settings. +*/ +public class DatabaseStreamConfig implements Cloneable { + private boolean readOnly = false; + private boolean readOnlyIsSet = false; + private boolean syncPerWrite = false; + + /** + Default configuration used if null is passed to methods that create a + database stream. + */ + public static final DatabaseStreamConfig DEFAULT = + new DatabaseStreamConfig(); + + /* package */ + static DatabaseStreamConfig checkNull(DatabaseStreamConfig config) { + return (config == null) ? DEFAULT : config; + } + + /** + Configure the database stream as read only. + <p> + @param readOnly + If true, configure the database stream to read only. + */ + public void setReadOnly(final boolean readOnly) { + this.readOnlyIsSet = true; + this.readOnly = readOnly; + } + + /** + Return true if the database stream is read only. + <p> + @return + true if the database stream is configured to read only. + */ + public boolean getReadOnly() { + return readOnly; + } + + /** + Configure the database stream to sync the blob on each write. + <p> + @param syncPerWrite + If true, configure the database stream to sync the blob on + each write. + */ + public void setSyncPerWrite(final boolean syncPerWrite) { + this.syncPerWrite = syncPerWrite; + } + + /** + Return if the database stream is configured to sync the blob + on each write. + <p> + @return + true if the database stream is configured to sync the blob + on each write, and false otherwise. + */ + public boolean getSyncPerWrite() { + return syncPerWrite; + } + + /* package */ + DbStream openDatabaseStream(final Dbc dbc) + throws DatabaseException { + + int flags = 0; + if (readOnlyIsSet) + flags |= readOnly ? DbConstants.DB_STREAM_READ : + DbConstants.DB_STREAM_WRITE; + if (syncPerWrite) + flags |= DbConstants.DB_STREAM_SYNC_WRITE; + return dbc.db_stream(flags); + } + +} diff --git a/lang/java/src/com/sleepycat/db/DatabaseType.java b/lang/java/src/com/sleepycat/db/DatabaseType.java index 8b3669f8..ffc905de 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseType.java +++ b/lang/java/src/com/sleepycat/db/DatabaseType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DeadlockException.java b/lang/java/src/com/sleepycat/db/DeadlockException.java index 63d04629..1079fb85 100644 --- a/lang/java/src/com/sleepycat/db/DeadlockException.java +++ b/lang/java/src/com/sleepycat/db/DeadlockException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Environment.java b/lang/java/src/com/sleepycat/db/Environment.java index 21934527..6037d216 100644 --- a/lang/java/src/com/sleepycat/db/Environment.java +++ b/lang/java/src/com/sleepycat/db/Environment.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -156,9 +156,8 @@ public class Environment { Close the database environment, freeing any allocated resources and closing any underlying subsystems. <p> - This function has verify similar - behavior as Environment.close(), except the following: - When each open database handle is closed, the database is synchronized. + This function is similar to Environment.close(), except that + each open database is synchronized as it is closed. */ public void closeForceSync() throws DatabaseException { @@ -166,6 +165,33 @@ public class Environment { dbenv.close(DbConstants.DB_FORCESYNC); } + /** + Close the database environment, freeing any allocated resources and + closing any underlying subsystems. + <p> + This function is similar to Environment.close(), except that + all memory mapped environment regions are synchronized as the + environment is closed. + */ + public void closeForceSyncEnv() + throws DatabaseException { + + dbenv.close(DbConstants.DB_FORCESYNCENV); + } + + /** + Close the database environment, freeing any allocated resources and + closing any underlying subsystems. + <p> + This function is similar to Environment.close(), except that + it has the effect of both closeForceSync() and closeForceSyncEnv(). + */ + public void closeForceSyncAndForceSyncEnv() + throws DatabaseException { + + dbenv.close(DbConstants.DB_FORCESYNC | DbConstants.DB_FORCESYNCENV); + } + /* package */ DbEnv unwrap() { return dbenv; @@ -1368,6 +1394,162 @@ performed using a specified {@link com.sleepycat.db.Environment Environment} han return dbenv.txn_stat(StatsConfig.checkNull(config).getFlags()); } + /* Statistics */ + /** + Print the cache subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printMempStats(StatsConfig config) + throws DatabaseException { + + return dbenv.memp_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the logging subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printLogStats(StatsConfig config) + throws DatabaseException { + + return dbenv.log_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the replication subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printReplicationStats(StatsConfig config) + throws DatabaseException { + + return dbenv.rep_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the Replication Manager subsystem statistical information to a + specified output channel (see the setMsgfile() method for more + information), or passed to an application callback function (see the + setMsgcall() method for more information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printReplicationManagerStats( + StatsConfig config) + throws DatabaseException { + + return dbenv.repmgr_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the locking subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printLockStats(StatsConfig config) + throws DatabaseException { + + return dbenv.lock_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the mutex subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printMutexStats(StatsConfig config) + throws DatabaseException { + + return dbenv.mutex_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print environment statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return dbenv.stat_print(StatsConfig.checkNull(config).getFlags()); + } + + + /** + Print the transaction subsystem statistical information to a specified + output channel (see the setMsgfile() method for more information), or + passed to an application callback function (see the setMsgcall() method + for more information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printTransactionStats(StatsConfig config) + throws DatabaseException { + + return dbenv.txn_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /* Transaction management */ /** Allocate a locker ID in an environment configured for Berkeley DB @@ -1994,4 +2176,36 @@ The release patch number. to create channel to send messages only to the master site. */ public static final int EID_MASTER = DbConstants.DB_EID_MASTER; + + /** + Set the blob threshold size. + <p> + @param value + The blob threshold size. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob file. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setBlobThreshold(int value) throws DatabaseException { + dbenv.set_blob_threshold(value, 0); + } + + /** + Sets the path of a file to store statistical information. + <p> + @param file + The path of a file to store statistical information. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setMsgfile(java.io.File file) throws DatabaseException { + if (file != null) { + dbenv.set_msgfile(file.toString()); + } + else { + dbenv.set_msgfile(null); + } + } } diff --git a/lang/java/src/com/sleepycat/db/EnvironmentConfig.java b/lang/java/src/com/sleepycat/db/EnvironmentConfig.java index d50fba5a..d87e907f 100644 --- a/lang/java/src/com/sleepycat/db/EnvironmentConfig.java +++ b/lang/java/src/com/sleepycat/db/EnvironmentConfig.java @@ -1,8 +1,7 @@ - /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -82,6 +81,9 @@ public class EnvironmentConfig implements Cloneable { private int backup_read_sleep = 0; private int backup_size = 0; private boolean backup_write_direct = false; + private int write_direct = 0; + private java.io.File blobDir = null; + private int blobThreshold = 0; private int cacheCount = 0; private long cacheSize = 0L; private long cacheMax = 0L; @@ -108,6 +110,8 @@ public class EnvironmentConfig implements Cloneable { private int maxWrite = 0; private long maxWriteSleep = 0L; private java.io.File metadataDir = null; + private java.io.File msgfile = null; + private String msgfileStr = null; private int mutexAlignment = 0; private int mutexIncrement = 0; private int mutexTestAndSetSpins = 0; @@ -132,6 +136,7 @@ public class EnvironmentConfig implements Cloneable { private java.io.File temporaryDirectory = null; private ReplicationManagerAckPolicy repmgrAckPolicy = ReplicationManagerAckPolicy.QUORUM; + private long repmgrIncomingQueueMax = 0; private java.util.Vector repmgrSitesConfig = new java.util.Vector(); /* Initial region resource allocation. */ @@ -170,7 +175,9 @@ public class EnvironmentConfig implements Cloneable { private boolean hotbackupInProgress = false; private boolean initializeRegions = false; private boolean logAutoRemove = false; + private boolean logBlobContent = false; private boolean logInMemory = false; + private boolean logNoSync = false; private boolean logZero = false; private boolean multiversion = false; private boolean noLocking = false; @@ -212,6 +219,8 @@ public class EnvironmentConfig implements Cloneable { private EventHandler eventHandler = null; private MessageHandler messageHandler = null; private PanicHandler panicHandler = null; + private boolean repViewIsSet = false; + private ReplicationViewHandler replicationViewHandler = null; private ReplicationTransport replicationTransport = null; /** @@ -247,6 +256,76 @@ True if the database environment is configured to create any } /** + Sets the path of a directory where blobs are stored. + <p> + The blobs of each {@link com.sleepycat.db.Database Database} opened + within this {@link com.sleepycat.db.Environment Environment} are + stored under this directory. + <p> + This path can not be set after opening the environment. + <p> + @param dir + The path of a directory where blobs are stored. + */ + public void setBlobDir(java.io.File dir) { + this.blobDir = dir; + } + + /** + Returns the path of a directory where blobs are stored. + <p> + The blobs of each {@link com.sleepycat.db.Database Database} opened + within this {@link com.sleepycat.db.Environment Environment} are + stored under this directory. + <p> + @return + The path of a directory where blobs are stored. + */ + public java.io.File getBlobDir() { + return blobDir; + } + + /** + Set the default blob threshold for databases opened in this environment. + The blob threshold is the size in bytes which is used to determine when + a data item will be stored as a blob. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob. + <p> + It is illegal to enable blob in the environment if any of + {@link com.sleepycat.db.EnvironmentConfig#setTxnSnapshot EnvironmentConfig.setTxnSnapshot}, + {@link com.sleepycat.db.EnvironmentConfig#setInitializeReplication EnvironmentConfig.setInitializeReplication}, + and {@link com.sleepycat.db.EnvironmentConfig#setMultiversion EnvironmentConfig.setMultiversion} + is called with true value. + <p> + This threshold value can be set any time before and after opening the + environment. + <p> + @param value + The size in bytes which is used to determine when a data item will + be stored as a blob. If 0, databases opened in the environment will default + to never using blob. + */ + public void setBlobThreshold(int value) { + this.blobThreshold = value; + } + + /** + Return the environment wide default blob threshold value. The blob + threshold is the size in bytes which is used to determine when a data item + will be stored as a blob. + <p> + @return + The blob threshold value in bytes beyond which data items are + stored as blobs. If 0, databases opened in the environment will default to + never using blobs. + */ + public int getBlobThreshold() { + return blobThreshold; + } + + /** Set the size of the shared memory buffer pool, that is, the size of the cache. <p> @@ -1468,6 +1547,29 @@ True if the system has been configured to to automatically remove log } /** + Enable full logging of blob data. Required for HA and the hotbackup + utility. + <p> + @param logBlobContent + If true, enable full logging of blob data. + */ + public void setLogBlobContent(final boolean logBlobContent) { + this.logBlobContent = logBlobContent; + } + + /** + Return true if full logging of blob data is enabled. + <p> + This method may be called at any time during the life of the application. + <p> + @return + True if full logging of blob data is enabled. + */ + public boolean getLogBlobContent() { + return logBlobContent; + } + + /** If set, maintain transaction logs in memory rather than on disk. This means that transactions exhibit the ACI (atomicity, consistency, and isolation) properties, but not D (durability); that is, database integrity will be @@ -1515,6 +1617,36 @@ True if the database environment is configured to maintain transaction logs } /** + Configure the system to avoid fsync() calls during log file flushes. + <p> + Log nosync is only safe when recovery is not needed after a system crash. + If the system remains alive and the application crashes, the database will + be recoverable in that situation. + <p> + This method may not be called after the environment has been opened. + <p> + @param logNoSync + If true, configure the system to avoid fsync() calls during log file flushes. + */ + public void setLogNoSync(final boolean logNoSync) { + this.logNoSync = logNoSync; + } + + /** + Return true if the system has been configured to avoid fsync() calls during + log files during flushes. + <p> + This method may be called at any time during the life of the application. + <p> + @return + True if the system has been configured to avoid fsync() calls during log + files flushes. + */ + public boolean getLogNoSync() { + return logNoSync; + } + + /** Set a function to process application-specific log records. <p> This method configures only operations performed using a single a @@ -1728,6 +1860,35 @@ The handler for application-specific log records. return repmgrAckPolicy; } + /** + Set the maximum amount of dynamic memory used by the Replication Manager + incoming queue. + <p> + By default, the Replication Manager incoming queue size has a limit of 100MB. + If zero is specified, then the Replication Manager incoming queue size is + limited by available heap memory. + <p> + @param repmgrIncomingQueueMax + The maximum amount of dynamic memory used by the Replication Manager incoming queue. + */ + public void setReplicationManagerIncomingQueueMax( + final long repmgrIncomingQueueMax) + { + this.repmgrIncomingQueueMax = repmgrIncomingQueueMax; + } + + /** + Get the maximum amount of dynamic memory used by the Replication Manager + incoming queue. + <p> + @return + The maximum amount of dynamic memory used by the Replication Manager incoming queue. + */ + public long getReplicationManagerIncomingQueueMax() + { + return this.repmgrIncomingQueueMax; + } + /** Configure a site in a replication group. This could be called more than once, to set local site and remote sites. @@ -2325,6 +2486,22 @@ The an OutputStream for displaying informational messages. return mmapSize; } + /** + Sets the path of a file to store statistical information. + <p> + This method may be called at any time during the life of the application. + <p> + @param file + The path of a file to store statistical information. + */ + public void setMsgfile(java.io.File file) { + this.msgfile = file; + if (file != null) + this.msgfileStr = file.toString(); + else + this.msgfileStr = null; + } + /** Sets the page size used to allocate the hash table and the number of mutexes expected to be needed by the buffer pool. @@ -2623,6 +2800,37 @@ The function to be called if the database environment panics. } /** + Set the function to be used by replication views to determine whether a + database file is replicated to the local site. + <p> + @param repViewHandler + The function name to determine whether a database file is replicated. If + null, the replication view is a full view and all database files are + replicated to the local site. Otherwise it is a partial view and only some + database files are replicated to the local site. + */ + public void setReplicationView( + final ReplicationViewHandler repViewHandler) { + this.repViewIsSet = true; + this.replicationViewHandler = repViewHandler; + } + + /** + Return the function name used by replication views to determine whether + a database file is replicated to the local site. + <p> + @return + The function name used by replication views to determine whether a database + file is replicated to the local site. If null, the replication view is a + full view and all database files are replicated to the local site. + Otherwise it is a partial view and only some database files are replicated + to the local site. + */ + public ReplicationViewHandler getReplicationViewHandler() { + return this.replicationViewHandler; + } + + /** Configure the database environment to only be accessed by a single process (although that process may be multithreaded). <p> @@ -4433,9 +4641,15 @@ True if the system has been configured to yield the processor if (logAutoRemove != oldConfig.logAutoRemove) dbenv.log_set_config(DbConstants.DB_LOG_AUTO_REMOVE, logAutoRemove); + if (logBlobContent != oldConfig.logBlobContent) + dbenv.log_set_config(DbConstants.DB_LOG_BLOB, logBlobContent); + if (logInMemory != oldConfig.logInMemory) dbenv.log_set_config(DbConstants.DB_LOG_IN_MEMORY, logInMemory); + if (logNoSync != oldConfig.logNoSync) + dbenv.log_set_config(DbConstants.DB_LOG_NOSYNC, logNoSync); + if (logZero != oldConfig.logZero) dbenv.log_set_config(DbConstants.DB_LOG_ZERO, logZero); @@ -4499,10 +4713,44 @@ True if the system has been configured to yield the processor dbenv.set_msgcall(messageHandler); if (panicHandler != oldConfig.panicHandler) dbenv.set_paniccall(panicHandler); + /* + * Configure replication views for a new environment or an existing + * environment with the callback provided by the application. + * If the callback is set as null, the replication view is a full view + * and all database files are replicated to the local site. Otherwise + * it is a partial view and only some database files are replicated to + * the local site. + */ + if (repViewIsSet) + dbenv.rep_set_view(replicationViewHandler); if (replicationTransport != oldConfig.replicationTransport) dbenv.rep_set_transport(envid, replicationTransport); /* Other settings */ + + if (backup_read_count != 0) + dbenv.set_backup_config(DbConstants.DB_BACKUP_READ_COUNT, + backup_read_count); + + if (backup_read_sleep != 0) + dbenv.set_backup_config(DbConstants.DB_BACKUP_READ_SLEEP, + backup_read_sleep); + + if (backup_size != 0) { + dbenv.set_backup_config(DbConstants.DB_BACKUP_SIZE, + backup_size); + } + + if (backup_write_direct == true) + dbenv.set_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT, 1); + else + dbenv.set_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT, 0); + + if (blobDir != oldConfig.blobDir) + dbenv.set_blob_dir(blobDir.toString()); + if (blobThreshold != oldConfig.blobThreshold) + dbenv.set_blob_threshold(blobThreshold, 0); + if (cacheSize != oldConfig.cacheSize || cacheCount != oldConfig.cacheCount) dbenv.set_cachesize(cacheSize, cacheCount); @@ -4558,6 +4806,8 @@ True if the system has been configured to yield the processor dbenv.set_mp_pagesize(mpPageSize); if (mpTableSize != oldConfig.mpTableSize) dbenv.set_mp_tablesize(mpTableSize); + if (msgfile != oldConfig.msgfile) + dbenv.set_msgfile(msgfile.toString()); if (password != null) dbenv.set_encrypt(password, DbConstants.DB_ENCRYPT_AES); if (replicationClockskewFast != oldConfig.replicationClockskewFast || @@ -4622,6 +4872,8 @@ True if the system has been configured to yield the processor DbConstants.DB_REP_CONF_INMEM, replicationInMemory); if (repmgrAckPolicy != oldConfig.repmgrAckPolicy) dbenv.repmgr_set_ack_policy(repmgrAckPolicy.getId()); + if (repmgrIncomingQueueMax != oldConfig.repmgrIncomingQueueMax) + dbenv.repmgr_set_incoming_queue_max(repmgrIncomingQueueMax); java.util.Iterator elems = repmgrSitesConfig.listIterator(); java.util.Iterator oldElems = oldConfig.repmgrSitesConfig.listIterator(); while (elems.hasNext()){ @@ -4708,7 +4960,9 @@ True if the system has been configured to yield the processor directLogIO = dbenv.log_get_config(DbConstants.DB_LOG_DIRECT); dsyncLog = dbenv.log_get_config(DbConstants.DB_LOG_DSYNC); logAutoRemove = dbenv.log_get_config(DbConstants.DB_LOG_AUTO_REMOVE); + logBlobContent = dbenv.log_get_config(DbConstants.DB_LOG_BLOB); logInMemory = dbenv.log_get_config(DbConstants.DB_LOG_IN_MEMORY); + logNoSync = dbenv.log_get_config(DbConstants.DB_LOG_NOSYNC); logZero = dbenv.log_get_config(DbConstants.DB_LOG_ZERO); } @@ -4742,6 +4996,21 @@ True if the system has been configured to yield the processor // XXX: replicationTransport and envid aren't available? /* Other settings */ + backup_read_count = + dbenv.get_backup_config(DbConstants.DB_BACKUP_READ_COUNT); + backup_read_sleep = + dbenv.get_backup_config(DbConstants.DB_BACKUP_READ_SLEEP); + backup_size = + dbenv.get_backup_config(DbConstants.DB_BACKUP_SIZE); + write_direct = + dbenv.get_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT); + backup_write_direct = (write_direct == 1) ? true : false; + + String blobDirStr = dbenv.get_blob_dir(); + if (blobDirStr != null) + blobDir = new java.io.File(blobDirStr); + blobThreshold = dbenv.get_blob_threshold(); + if (initializeCache) { cacheSize = dbenv.get_cachesize(); cacheMax = dbenv.get_cache_max(); @@ -4802,6 +5071,8 @@ True if the system has been configured to yield the processor logRegionSize = 0; } messageStream = dbenv.get_message_stream(); + if (msgfileStr != null) + msgfile = new java.io.File(msgfileStr); // XXX: intentional information loss? password = (dbenv.get_encrypt_flags() == 0) ? null : ""; @@ -4846,10 +5117,12 @@ True if the system has been configured to yield the processor replicationRequestMax = dbenv.rep_get_request_max(); repmgrAckPolicy = ReplicationManagerAckPolicy.fromInt( dbenv.repmgr_get_ack_policy()); + repmgrIncomingQueueMax = dbenv.repmgr_get_incoming_queue_max(); } else { replicationLimit = 0L; replicationRequestMin = 0; replicationRequestMax = 0; + repmgrIncomingQueueMax = 0; } segmentId = dbenv.get_shm_key(); diff --git a/lang/java/src/com/sleepycat/db/ErrorHandler.java b/lang/java/src/com/sleepycat/db/ErrorHandler.java index 43fdb9de..4ef5b206 100644 --- a/lang/java/src/com/sleepycat/db/ErrorHandler.java +++ b/lang/java/src/com/sleepycat/db/ErrorHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/EventHandler.java b/lang/java/src/com/sleepycat/db/EventHandler.java index a876a645..6bbdf20a 100644 --- a/lang/java/src/com/sleepycat/db/EventHandler.java +++ b/lang/java/src/com/sleepycat/db/EventHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -50,6 +50,16 @@ public interface EventHandler { public void handlePanicEvent(); /** + A callback function to be called when a Replication automatic takeover + failed event is sent from the Berkeley DB library. + <p> + This event callback is received in a replication manager subordinate + process when it fails to take over as the replication process and + all replication manager threads in it are stopped unexpectedly. + */ + public void handleRepAutoTakeoverFailedEvent(); + + /** A callback function to be called when a Replication Client event is sent from the Berkeley DB library. <p> @@ -133,6 +143,15 @@ public interface EventHandler { A callback function to be called when an event is sent from the Berkeley DB library. <p> + This event callback is received when replication Mananger incoming queue + has reached its maximum threshold. + */ + public void handleRepInQueueFullEvent(); + + /** + A callback function to be called when an event is sent from the + Berkeley DB library. + <p> This event callback is received when the local site could not synchronize with the master because an internal initialization was required, but internal initialization has been turned off by the {@link com.sleepycat.db.ReplicationConfig#AUTOINIT ReplicationConfig.AUTOINIT} diff --git a/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java b/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java index ef563df9..c2ddabd7 100644 --- a/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java +++ b/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -28,6 +28,11 @@ public abstract class EventHandlerAdapter implements EventHandler { */ public void handlePanicEvent() {} /** + See {@link com.sleepycat.db.EventHandler#handleRepAutoTakeoverFailedEvent EventHandler.handleRepAutoTakeoverFailedEvent} for details of this + callback. + */ + public void handleRepAutoTakeoverFailedEvent() {} + /** See {@link com.sleepycat.db.EventHandler#handleRepClientEvent EventHandler.handleRepClientEvent} for details of this callback. */ @@ -68,6 +73,11 @@ public abstract class EventHandlerAdapter implements EventHandler { */ public void handleRepInitDoneEvent() {} /** + see {@link com.sleepycat.db.EventHandler#handleRepInQueueFullEvent EventHandler.handleRepInQueueFullEvent}for details of this + callback. + */ + public void handleRepInQueueFullEvent() {} + /** See {@link com.sleepycat.db.EventHandler#handleRepJoinFailureEvent EventHandler.handleRepJoinFailureEvent} for details of this callback. */ diff --git a/lang/java/src/com/sleepycat/db/FeedbackHandler.java b/lang/java/src/com/sleepycat/db/FeedbackHandler.java index 63bec27d..2c8cabec 100644 --- a/lang/java/src/com/sleepycat/db/FeedbackHandler.java +++ b/lang/java/src/com/sleepycat/db/FeedbackHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java b/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java index 1bf66750..122b243d 100644 --- a/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java +++ b/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java b/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java index 08174654..f55ffeaf 100644 --- a/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java +++ b/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java b/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java index 71311de5..0b4b986b 100644 --- a/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java +++ b/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HashStats.java b/lang/java/src/com/sleepycat/db/HashStats.java index b073904c..f33b82d3 100644 --- a/lang/java/src/com/sleepycat/db/HashStats.java +++ b/lang/java/src/com/sleepycat/db/HashStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -66,6 +66,14 @@ public class HashStats extends DatabaseStats { return hash_ndata; } + private int hash_nblobs; + /** + The number of blob records. + */ + public int getNumBlobs() { + return hash_nblobs; + } + private int hash_pagecnt; /** The number of pages in the database. @@ -94,7 +102,7 @@ public class HashStats extends DatabaseStats { private int hash_buckets; /** - The the number of hash buckets. + The number of hash buckets. */ public int getBuckets() { return hash_buckets; @@ -124,7 +132,8 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private int hash_bigpages; /** - The number of big key/data pages. + The number of hash overflow pages (created when key/data is too big for + the page). <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -135,7 +144,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private long hash_big_bfree; /** - The number of bytes free on big item pages. + The number of bytes free on hash overflow (big item) pages. <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -146,7 +155,8 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private int hash_overflows; /** - The number of overflow pages. + The number of bucket overflow pages (bucket overflow pages are created when + items did not fit on the main bucket page). <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -157,7 +167,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private long hash_ovfl_free; /** - The number of bytes free on overflow pages. + The number of bytes free on bucket overflow pages. <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -199,6 +209,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi + "\n hash_metaflags=" + hash_metaflags + "\n hash_nkeys=" + hash_nkeys + "\n hash_ndata=" + hash_ndata + + "\n hash_nblobs=" + hash_nblobs + "\n hash_pagecnt=" + hash_pagecnt + "\n hash_pagesize=" + hash_pagesize + "\n hash_ffactor=" + hash_ffactor diff --git a/lang/java/src/com/sleepycat/db/Hasher.java b/lang/java/src/com/sleepycat/db/Hasher.java index 45349a68..28e44995 100644 --- a/lang/java/src/com/sleepycat/db/Hasher.java +++ b/lang/java/src/com/sleepycat/db/Hasher.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapFullException.java b/lang/java/src/com/sleepycat/db/HeapFullException.java index 232cb067..9faf60da 100644 --- a/lang/java/src/com/sleepycat/db/HeapFullException.java +++ b/lang/java/src/com/sleepycat/db/HeapFullException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapRecordId.java b/lang/java/src/com/sleepycat/db/HeapRecordId.java index 2f926a39..ac719d73 100644 --- a/lang/java/src/com/sleepycat/db/HeapRecordId.java +++ b/lang/java/src/com/sleepycat/db/HeapRecordId.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapStats.java b/lang/java/src/com/sleepycat/db/HeapStats.java index a63ae7bf..08f450f5 100644 --- a/lang/java/src/com/sleepycat/db/HeapStats.java +++ b/lang/java/src/com/sleepycat/db/HeapStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -40,6 +40,14 @@ public class HeapStats extends DatabaseStats { return heap_metaflags; } + private int heap_nblobs; + /** + The number of blob records. + */ + public int getHeapNumBlobs() { + return heap_nblobs; + } + private int heap_nrecs; /** Reports the number of records in the Heap database. @@ -73,7 +81,10 @@ public class HeapStats extends DatabaseStats { } private int heap_regionsize; - /** TODO */ + /** + The number of pages in a region in the Heap database. Returned if + DB_FAST_STAT is set. + */ public int getHeapRegionSize() { return heap_regionsize; } @@ -87,6 +98,7 @@ public class HeapStats extends DatabaseStats { + "\n heap_magic=" + heap_magic + "\n heap_version=" + heap_version + "\n heap_metaflags=" + heap_metaflags + + "\n heap_nblobs=" + heap_nblobs + "\n heap_nrecs=" + heap_nrecs + "\n heap_pagecnt=" + heap_pagecnt + "\n heap_pagesize=" + heap_pagesize diff --git a/lang/java/src/com/sleepycat/db/JoinConfig.java b/lang/java/src/com/sleepycat/db/JoinConfig.java index cde2e1c7..358cce77 100644 --- a/lang/java/src/com/sleepycat/db/JoinConfig.java +++ b/lang/java/src/com/sleepycat/db/JoinConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/JoinCursor.java b/lang/java/src/com/sleepycat/db/JoinCursor.java index f426af7f..60ae53c6 100644 --- a/lang/java/src/com/sleepycat/db/JoinCursor.java +++ b/lang/java/src/com/sleepycat/db/JoinCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/KeyRange.java b/lang/java/src/com/sleepycat/db/KeyRange.java index a2cdbe47..3ebf6942 100644 --- a/lang/java/src/com/sleepycat/db/KeyRange.java +++ b/lang/java/src/com/sleepycat/db/KeyRange.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Lock.java b/lang/java/src/com/sleepycat/db/Lock.java index 88e0542b..557aefa8 100644 --- a/lang/java/src/com/sleepycat/db/Lock.java +++ b/lang/java/src/com/sleepycat/db/Lock.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockDetectMode.java b/lang/java/src/com/sleepycat/db/LockDetectMode.java index c673a31d..775110a1 100644 --- a/lang/java/src/com/sleepycat/db/LockDetectMode.java +++ b/lang/java/src/com/sleepycat/db/LockDetectMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockMode.java b/lang/java/src/com/sleepycat/db/LockMode.java index d8fb16a5..a75001e4 100644 --- a/lang/java/src/com/sleepycat/db/LockMode.java +++ b/lang/java/src/com/sleepycat/db/LockMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockNotGrantedException.java b/lang/java/src/com/sleepycat/db/LockNotGrantedException.java index 1c0281f2..9b41ef1a 100644 --- a/lang/java/src/com/sleepycat/db/LockNotGrantedException.java +++ b/lang/java/src/com/sleepycat/db/LockNotGrantedException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockOperation.java b/lang/java/src/com/sleepycat/db/LockOperation.java index 0063d821..e9660e11 100644 --- a/lang/java/src/com/sleepycat/db/LockOperation.java +++ b/lang/java/src/com/sleepycat/db/LockOperation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockRequest.java b/lang/java/src/com/sleepycat/db/LockRequest.java index 8453b806..e170c4f3 100644 --- a/lang/java/src/com/sleepycat/db/LockRequest.java +++ b/lang/java/src/com/sleepycat/db/LockRequest.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockRequestMode.java b/lang/java/src/com/sleepycat/db/LockRequestMode.java index 915fcd82..a1a44095 100644 --- a/lang/java/src/com/sleepycat/db/LockRequestMode.java +++ b/lang/java/src/com/sleepycat/db/LockRequestMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockStats.java b/lang/java/src/com/sleepycat/db/LockStats.java index c06f720d..649b165c 100644 --- a/lang/java/src/com/sleepycat/db/LockStats.java +++ b/lang/java/src/com/sleepycat/db/LockStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -299,36 +299,36 @@ public class LockStats { private long st_part_wait; /** - The number of times that a thread of control was forced to wait before - obtaining a lock partition mutex. - * */ + The number of times that a thread of control was forced to wait before + obtaining a lock partition mutex. + */ public long getPartWait() { return st_part_wait; } private long st_part_nowait; /** - The number of times that a thread of control was able to obtain a lock - partition mutex without waiting. - * */ + The number of times that a thread of control was able to obtain a lock + partition mutex without waiting. + */ public long getPartNowait() { return st_part_nowait; } private long st_part_max_wait; /** - The maximum number of times that a thread of control was forced to wait - before obtaining any one lock partition mutex. - * */ + The maximum number of times that a thread of control was forced to wait + before obtaining any one lock partition mutex. + */ public long getPartMaxWait() { return st_part_max_wait; } private long st_part_max_nowait; /** - The number of times that a thread of control was able to obtain any one - lock partition mutex without waiting. - * */ + The number of times that a thread of control was able to obtain any one + lock partition mutex without waiting. + */ public long getPartMaxNowait() { return st_part_max_nowait; } @@ -371,8 +371,8 @@ public class LockStats { private long st_region_wait; /** - The number of times that a thread of control was forced to wait - before obtaining the region lock. + The number of times that a thread of control was forced to wait before + obtaining the lock region mutex. */ public long getRegionWait() { return st_region_wait; @@ -380,13 +380,29 @@ public class LockStats { private long st_region_nowait; /** - The number of times that a thread of control was able to obtain the - region lock without waiting. + The number of times that a thread of control was able to obtain the lock + region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; } + private long st_nlockers_hit; + /** + The number of hits in the thread locker cache. + */ + public long getNumLockersHit() { + return st_nlockers_hit; + } + + private long st_nlockers_reused; + /** + Total number of lockers reused. + */ + public long getNumLockersReused() { + return st_nlockers_reused; + } + private int st_hash_len; /** Maximum length of a lock hash bucket. @@ -456,6 +472,8 @@ public class LockStats { + "\n st_lockers_nowait=" + st_lockers_nowait + "\n st_region_wait=" + st_region_wait + "\n st_region_nowait=" + st_region_nowait + + "\n st_nlockers_hit=" + st_nlockers_hit + + "\n st_nlockers_reused=" + st_nlockers_reused + "\n st_hash_len=" + st_hash_len + "\n st_regsize=" + st_regsize ; diff --git a/lang/java/src/com/sleepycat/db/LogCursor.java b/lang/java/src/com/sleepycat/db/LogCursor.java index ca51b380..20f5269e 100644 --- a/lang/java/src/com/sleepycat/db/LogCursor.java +++ b/lang/java/src/com/sleepycat/db/LogCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogRecordHandler.java b/lang/java/src/com/sleepycat/db/LogRecordHandler.java index 843a072c..e64082e1 100644 --- a/lang/java/src/com/sleepycat/db/LogRecordHandler.java +++ b/lang/java/src/com/sleepycat/db/LogRecordHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogSequenceNumber.java b/lang/java/src/com/sleepycat/db/LogSequenceNumber.java index 017d4681..9fdbc27f 100644 --- a/lang/java/src/com/sleepycat/db/LogSequenceNumber.java +++ b/lang/java/src/com/sleepycat/db/LogSequenceNumber.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogStats.java b/lang/java/src/com/sleepycat/db/LogStats.java index 3072913e..f2b824ea 100644 --- a/lang/java/src/com/sleepycat/db/LogStats.java +++ b/lang/java/src/com/sleepycat/db/LogStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -147,7 +147,7 @@ public class LogStats { private long st_region_wait; /** The number of times that a thread of control was forced to wait - before obtaining the region lock. + before obtaining the log region mutex. */ public long getRegionWait() { return st_region_wait; @@ -155,8 +155,8 @@ public class LogStats { private long st_region_nowait; /** - The number of times that a thread of control was able to obtain the - region lock without waiting. + The number of times that a thread of control was able to obtain + the log region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; diff --git a/lang/java/src/com/sleepycat/db/LogVerifyConfig.java b/lang/java/src/com/sleepycat/db/LogVerifyConfig.java index b64c1c1f..19c86513 100644 --- a/lang/java/src/com/sleepycat/db/LogVerifyConfig.java +++ b/lang/java/src/com/sleepycat/db/LogVerifyConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2009, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: LogVerifyConfig.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/db/MemoryException.java b/lang/java/src/com/sleepycat/db/MemoryException.java index 8c3fe56b..f0ed44f7 100644 --- a/lang/java/src/com/sleepycat/db/MemoryException.java +++ b/lang/java/src/com/sleepycat/db/MemoryException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MessageHandler.java b/lang/java/src/com/sleepycat/db/MessageHandler.java index 16cdea2b..d0db1d0c 100644 --- a/lang/java/src/com/sleepycat/db/MessageHandler.java +++ b/lang/java/src/com/sleepycat/db/MessageHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java b/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java new file mode 100644 index 00000000..45609483 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java @@ -0,0 +1,33 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbEnv; + + +/** +A MetaCheckSumFailException is thrown when a checksum mismatch is detected +on a database metadata page. Either the database is corrupted or the file +is not a Berkeley DB database file. +*/ +public class MetaCheckSumFailException extends DatabaseException { + private String message; + + /* package */ MetaCheckSumFailException(final String message, + final int errno, final DbEnv dbenv) { + super(message, errno, dbenv); + this.message = message; + } + + /** {@inheritDoc} */ + public String toString() { + return message; + } + +} diff --git a/lang/java/src/com/sleepycat/db/MultipleDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleDataEntry.java index 9d216bae..52c611c7 100644 --- a/lang/java/src/com/sleepycat/db/MultipleDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleEntry.java b/lang/java/src/com/sleepycat/db/MultipleEntry.java index 0c526ee1..cd0b0339 100644 --- a/lang/java/src/com/sleepycat/db/MultipleEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java index 3113d657..d5d72f98 100644 --- a/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java index 3095815d..4b0a21e5 100644 --- a/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java index 4d8ebc36..73578864 100644 --- a/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java index 7dac980a..5483b2cc 100644 --- a/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java index 1ad28add..6660669a 100644 --- a/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MutexStats.java b/lang/java/src/com/sleepycat/db/MutexStats.java index 6f40e40b..1d009b41 100644 --- a/lang/java/src/com/sleepycat/db/MutexStats.java +++ b/lang/java/src/com/sleepycat/db/MutexStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/OperationStatus.java b/lang/java/src/com/sleepycat/db/OperationStatus.java index 8cbdac14..35f49da0 100644 --- a/lang/java/src/com/sleepycat/db/OperationStatus.java +++ b/lang/java/src/com/sleepycat/db/OperationStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/PanicHandler.java b/lang/java/src/com/sleepycat/db/PanicHandler.java index e4a09443..27dbc14f 100644 --- a/lang/java/src/com/sleepycat/db/PanicHandler.java +++ b/lang/java/src/com/sleepycat/db/PanicHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/PartitionHandler.java b/lang/java/src/com/sleepycat/db/PartitionHandler.java index dce9e6a6..aa764c69 100644 --- a/lang/java/src/com/sleepycat/db/PartitionHandler.java +++ b/lang/java/src/com/sleepycat/db/PartitionHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -9,7 +9,13 @@ package com.sleepycat.db; /** -An interface specifying how Btree prefixes should be calculated. +An interface specifying how to set up database partitioning. +Implementation of this interface is required when +{@link com.sleepycat.db.Database} is opened and +{@link DatabaseConfig#setPartitionByCallback DatabaseConfig.setPartitionByCallback} is called. +<p> +You configure the database with this handler using the +{@link DatabaseConfig#setPartitionByCallback DatabaseConfig.setPartitionByCallback} method. */ public interface PartitionHandler { /** @@ -19,6 +25,8 @@ public interface PartitionHandler { The enclosing database handle. @param key A database entry representing a database key. + @return + A partition number for the key. */ int partition(Database db, DatabaseEntry key); } diff --git a/lang/java/src/com/sleepycat/db/PreparedTransaction.java b/lang/java/src/com/sleepycat/db/PreparedTransaction.java index a8d3c8f8..c6189015 100644 --- a/lang/java/src/com/sleepycat/db/PreparedTransaction.java +++ b/lang/java/src/com/sleepycat/db/PreparedTransaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/QueueStats.java b/lang/java/src/com/sleepycat/db/QueueStats.java index 29006467..3a0e3eef 100644 --- a/lang/java/src/com/sleepycat/db/QueueStats.java +++ b/lang/java/src/com/sleepycat/db/QueueStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/RecordNumberAppender.java b/lang/java/src/com/sleepycat/db/RecordNumberAppender.java index eb10a768..e1f09412 100644 --- a/lang/java/src/com/sleepycat/db/RecordNumberAppender.java +++ b/lang/java/src/com/sleepycat/db/RecordNumberAppender.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/RecoveryOperation.java b/lang/java/src/com/sleepycat/db/RecoveryOperation.java index bea18d17..7f07abde 100644 --- a/lang/java/src/com/sleepycat/db/RecoveryOperation.java +++ b/lang/java/src/com/sleepycat/db/RecoveryOperation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/RegionResourceType.java b/lang/java/src/com/sleepycat/db/RegionResourceType.java index ceca9746..a3df3b14 100644 --- a/lang/java/src/com/sleepycat/db/RegionResourceType.java +++ b/lang/java/src/com/sleepycat/db/RegionResourceType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationChannel.java b/lang/java/src/com/sleepycat/db/ReplicationChannel.java index 91446fe0..366a47b2 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationChannel.java +++ b/lang/java/src/com/sleepycat/db/ReplicationChannel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationConfig.java b/lang/java/src/com/sleepycat/db/ReplicationConfig.java index ede4df75..a46ad274 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationConfig.java +++ b/lang/java/src/com/sleepycat/db/ReplicationConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -78,7 +78,28 @@ public final class ReplicationConfig implements Cloneable { Once this option is turned on, it may never be turned off. */ public static final ReplicationConfig LEASE = - new ReplicationConfig("LEASE", DbConstants.DB_REP_CONF_LEASE); + new ReplicationConfig("LEASE", DbConstants.DB_REP_CONF_LEASE); + + /** + This flag is used to specify the preferred master site in a replication + group operating in preferred master mode. A preferred master replication + group must contain only two sites, with one site specified as the preferred + master site and the other site specified as the client site. The preferred + master site operates as the master site whenever possible. + **/ + public static final ReplicationConfig PREFMAS_MASTER = + new ReplicationConfig("PREFMAS_MASTER", DbConstants.DB_REPMGR_CONF_PREFMAS_MASTER); + + /** + This flag is used to specify the client site in a replication group + operating in preferred master mode. A preferred master replication group + must contain only two sites, with one site specified as the preferred + master site and the other site specified as the client site. The client + site in a preferred master replication group takes over temporarily as + master when the preferred master site is unavailable. + **/ + public static final ReplicationConfig PREFMAS_CLIENT = + new ReplicationConfig("PREFMAS_CLIENT", DbConstants.DB_REPMGR_CONF_PREFMAS_CLIENT); /* package */ static ReplicationConfig fromInt(int which) { @@ -95,8 +116,12 @@ public final class ReplicationConfig implements Cloneable { return STRICT_2SITE; case DbConstants.DB_REPMGR_CONF_ELECTIONS: return ELECTIONS; - case DbConstants.DB_REP_CONF_LEASE: - return LEASE; + case DbConstants.DB_REP_CONF_LEASE: + return LEASE; + case DbConstants.DB_REPMGR_CONF_PREFMAS_MASTER: + return PREFMAS_MASTER; + case DbConstants.DB_REPMGR_CONF_PREFMAS_CLIENT: + return PREFMAS_CLIENT; default: throw new IllegalArgumentException( "Unknown replication config: " + which); diff --git a/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java b/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java index 216d47fc..6ba215db 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java b/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java index 7df82663..31a4cd51 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java b/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java index e98cae13..a141ac97 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java b/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java index c49bdf7d..9ee4051d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java b/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java index b9f77174..88ad7c3e 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java b/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java index 6af9f381..df20af90 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java b/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java index 34f24d9e..3a1f1da7 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java b/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java index df6a74ef..b34a8b6d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -11,8 +11,8 @@ package com.sleepycat.db; import com.sleepycat.db.internal.DbConstants; /** -A class that provides definitions for the types of network ack policyto use -when transmitting messages between replication sites using theReplication +A class that provides definitions for the types of network ack policy to use +when transmitting messages between replication sites using the Replication Manager. <p> Set using the {@link com.sleepycat.db.EnvironmentConfig#setReplicationManagerAckPolicy EnvironmentConfig.setReplicationManagerAckPolicy} API. diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java b/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java index b62342d9..94a36599 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java b/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java index ae10fe5f..3de8d2c9 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java index 6bc55e3d..4a5cbd9d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java index 7a6e0ccd..b39012c0 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java index ac30c3e1..e0b6e522 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -31,7 +31,7 @@ public class ReplicationManagerSiteInfo */ public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid) { - this(hostAddr, eid, false, false); + this(hostAddr, eid, false, false, false); } /** @@ -39,18 +39,19 @@ public class ReplicationManagerSiteInfo */ public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected) { - this(hostAddr, eid, isConnected, false); + this(hostAddr, eid, isConnected, false, false); } /** Create a ReplicationManagerSiteInfo with the given information. */ - public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected, boolean isPeer) + public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected, boolean isPeer, boolean isView) { - this.addr = hostAddr; + this.addr = hostAddr; this.eid = eid; this.status = isConnected ? DbConstants.DB_REPMGR_CONNECTED : 0; this.flags = isPeer ? DbConstants.DB_REPMGR_ISPEER : 0; + this.flags |= isView ? DbConstants.DB_REPMGR_ISVIEW : 0; } /** @@ -77,5 +78,12 @@ public class ReplicationManagerSiteInfo public boolean isPeer() { return ((this.flags & DbConstants.DB_REPMGR_ISPEER) != 0); } + + /** + The replication site is a view. + */ + public boolean isView() { + return ((this.flags & DbConstants.DB_REPMGR_ISVIEW) != 0); + } } diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java b/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java index a5991419..8adbed23 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java b/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java index 0feca5c1..6b01f267 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -18,9 +18,10 @@ public class ReplicationManagerStats { private long st_perm_failed; /** - The number of times a PERM message originating at this site did - not receive sufficient acknowledgement from clients, according to the - configured acknowledgement policy and acknowledgement timeout. + The number of times a message critical for maintaining database + integrity (for example, a transaction commit), originating at this site, + did not receive sufficient acknowledgement from clients, according to + the configured acknowledgement policy and acknowledgement timeout */ public long getPermFailed() { return st_perm_failed; @@ -28,7 +29,9 @@ public class ReplicationManagerStats { private long st_msgs_queued; /** - The number of messages queued due to a network delay. + The number of outgoing messages which could not be transmitted + immediately, due to a full network buffer, and had to be queued for + later delivery. */ public long getMsgsQueued() { return st_msgs_queued; @@ -36,16 +39,48 @@ public class ReplicationManagerStats { private long st_msgs_dropped; /** - The number of messages discarded due to queue length overflows. + The number of outgoing messages that were dropped, because the outgoing + message queue was full. (Berkeley DB replication is tolerant of dropped + messages, and will automatically request retransmission of any missing + messages as needed.) */ public long getMsgsDropped() { return st_msgs_dropped; } + private int st_incoming_queue_gbytes; + /** + Gigabytes component of the memory consumption for the messages + currently in the incoming queue. + */ + public int getIncomingQueueGbytes() { + return st_incoming_queue_gbytes; + } + + private int st_incoming_queue_bytes; + /** + Bytes component of the memory consumption for the messages currently + in the incoming queue. + */ + public int getIncomingQueueBytes() { + return st_incoming_queue_bytes; + } + + private long st_incoming_msgs_dropped; + /** + The number of incoming messages that were dropped because the incoming + queue was full. (Berkeley DB replication is tolerant of dropped + messages, and will automatically request retransmission of any missing + messages as needed.) + */ + public long getIncomingMsgsDropped() { + return st_incoming_msgs_dropped; + } + private long st_connection_drop; /** - The number of existing connections that have been dropped since the - statistics were last reset. + The number of existing connections that have been dropped + since the statistics were last reset. */ public long getConnectionDrop() { return st_connection_drop; @@ -53,28 +88,62 @@ public class ReplicationManagerStats { private long st_connect_fail; /** - The number of times new connection attempts have failed. + The number of times an attempt to open a new TCP/IP connection + failed. */ public long getConnectFail() { return st_connect_fail; } - private long st_elect_threads; + private int st_elect_threads; /** - Number of currently active election threads. + Number of currently active election threads. */ - public long getElectThreads() { + public int getElectThreads() { return st_elect_threads; } - private long st_max_elect_threads; + private int st_max_elect_threads; /** - Election threads for which space is reserved. + The number of election threads for which space is reserved. */ - public long getMaxElectThreads() { + public int getMaxElectThreads() { return st_max_elect_threads; } + private int st_site_participants; + /** + Number of replication group participant sites. + */ + public int getSiteParticipants() { + return st_site_participants; + } + + private int st_site_total; + /** + Total number of replication group sites. + */ + public int getSiteTotal() { + return st_site_total; + } + + private int st_site_views; + /** + Number of replication group view sites. + */ + public int getSiteViews() { + return st_site_views; + } + + private long st_takeovers; + /** + The number of times a subordinate process took over as the replication + process after a previous replication process has finished successfully. + */ + public long getTakeovers() { + return st_takeovers; + } + /** For convenience, the ReplicationManagerStats class has a toString method that lists all the data fields. @@ -84,10 +153,17 @@ public class ReplicationManagerStats { + "\n st_perm_failed=" + st_perm_failed + "\n st_msgs_queued=" + st_msgs_queued + "\n st_msgs_dropped=" + st_msgs_dropped + + "\n st_incoming_queue_gbytes=" + st_incoming_queue_gbytes + + "\n st_incoming_queue_bytes=" + st_incoming_queue_bytes + + "\n st_incoming_msgs_dropped=" + st_incoming_msgs_dropped + "\n st_connection_drop=" + st_connection_drop + "\n st_connect_fail=" + st_connect_fail + "\n st_elect_threads=" + st_elect_threads + "\n st_max_elect_threads=" + st_max_elect_threads + + "\n st_site_participants=" + st_site_participants + + "\n st_site_total=" + st_site_total + + "\n st_site_views=" + st_site_views + + "\n st_takeovers=" + st_takeovers ; } } diff --git a/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java b/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java index 977de157..bc74c867 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationStats.java b/lang/java/src/com/sleepycat/db/ReplicationStats.java index ff035b4d..5c0c7eef 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationStats.java +++ b/lang/java/src/com/sleepycat/db/ReplicationStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -38,6 +38,12 @@ public class ReplicationStats { return (st_startup_complete != 0); } + private int st_view; + /** True if the site is a view and false if not. */ + public boolean getView() { + return (st_view != 0); + } + private long st_log_queued; /** The number of log records currently queued. */ public long getLogQueued() { @@ -405,6 +411,7 @@ public class ReplicationStats { public String toString() { return "ReplicationStats:" + "\n st_startup_complete=" + (st_startup_complete != 0) + + "\n st_view=" + st_view + "\n st_log_queued=" + st_log_queued + "\n st_status=" + st_status + "\n st_next_lsn=" + st_next_lsn diff --git a/lang/java/src/com/sleepycat/db/ReplicationStatus.java b/lang/java/src/com/sleepycat/db/ReplicationStatus.java index c7114ea9..a7421065 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationStatus.java +++ b/lang/java/src/com/sleepycat/db/ReplicationStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java b/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java index 583a658c..e1377e8d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java +++ b/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationTransport.java b/lang/java/src/com/sleepycat/db/ReplicationTransport.java index 8fa23f93..287f6479 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationTransport.java +++ b/lang/java/src/com/sleepycat/db/ReplicationTransport.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java b/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java new file mode 100644 index 00000000..aec03f41 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java @@ -0,0 +1,31 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +/** +An interface specifying a callback function to be used by replication views. +*/ +public interface ReplicationViewHandler { + /** + The application-specific function used by replication views to determine + whether a database file is replicated. + <p> + @param dbenv + The enclosing database environment handle. + @param name + The name of the database file. + @param flags + Currently unused. + @return True if the file is replicated, or false if not. + @throws DatabaseException if an error occurs when determining whether or + not the database file is replicated. + */ + boolean partial_view(Environment dbenv, String name, int flags) + throws DatabaseException; +} diff --git a/lang/java/src/com/sleepycat/db/RunRecoveryException.java b/lang/java/src/com/sleepycat/db/RunRecoveryException.java index f071c067..309df1e5 100644 --- a/lang/java/src/com/sleepycat/db/RunRecoveryException.java +++ b/lang/java/src/com/sleepycat/db/RunRecoveryException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryConfig.java b/lang/java/src/com/sleepycat/db/SecondaryConfig.java index b1799f3f..3862785c 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryConfig.java +++ b/lang/java/src/com/sleepycat/db/SecondaryConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryCursor.java b/lang/java/src/com/sleepycat/db/SecondaryCursor.java index f59ef066..7b2b0433 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryCursor.java +++ b/lang/java/src/com/sleepycat/db/SecondaryCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryDatabase.java b/lang/java/src/com/sleepycat/db/SecondaryDatabase.java index 616bdfa5..c854aa1e 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryDatabase.java +++ b/lang/java/src/com/sleepycat/db/SecondaryDatabase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java b/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java index e988fb78..df8ded12 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java +++ b/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java b/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java index 7411f779..23b5430e 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java +++ b/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Sequence.java b/lang/java/src/com/sleepycat/db/Sequence.java index 576d9993..3d7484aa 100644 --- a/lang/java/src/com/sleepycat/db/Sequence.java +++ b/lang/java/src/com/sleepycat/db/Sequence.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -127,4 +127,22 @@ must be specified. return seq.stat(config.getFlags()); } + + /** + Print statistical information about the sequence to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config + The statistics returned; if null, default statistics are returned. + <p> + @return + A non-zero error value on failure and 0 on success. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return seq.stat_print(config.getFlags()); + } } diff --git a/lang/java/src/com/sleepycat/db/SequenceConfig.java b/lang/java/src/com/sleepycat/db/SequenceConfig.java index 47f05d83..38e8b3d9 100644 --- a/lang/java/src/com/sleepycat/db/SequenceConfig.java +++ b/lang/java/src/com/sleepycat/db/SequenceConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SequenceStats.java b/lang/java/src/com/sleepycat/db/SequenceStats.java index fe435536..c2e21172 100644 --- a/lang/java/src/com/sleepycat/db/SequenceStats.java +++ b/lang/java/src/com/sleepycat/db/SequenceStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/StatsConfig.java b/lang/java/src/com/sleepycat/db/StatsConfig.java index e8af08cf..a0768b55 100644 --- a/lang/java/src/com/sleepycat/db/StatsConfig.java +++ b/lang/java/src/com/sleepycat/db/StatsConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Transaction.java b/lang/java/src/com/sleepycat/db/Transaction.java index ec7f0514..85367fd7 100644 --- a/lang/java/src/com/sleepycat/db/Transaction.java +++ b/lang/java/src/com/sleepycat/db/Transaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/TransactionConfig.java b/lang/java/src/com/sleepycat/db/TransactionConfig.java index f9cb0b00..079e5f6a 100644 --- a/lang/java/src/com/sleepycat/db/TransactionConfig.java +++ b/lang/java/src/com/sleepycat/db/TransactionConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/TransactionStats.java b/lang/java/src/com/sleepycat/db/TransactionStats.java index d7602efa..9d893286 100644 --- a/lang/java/src/com/sleepycat/db/TransactionStats.java +++ b/lang/java/src/com/sleepycat/db/TransactionStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -59,7 +59,7 @@ public class TransactionStats { } private int priority; - /** Assigned priority used when resolving deadlocks. */ + /** This transaction's deadlock resolution priority. */ public int getPriority() { return priority; } @@ -205,8 +205,8 @@ public class TransactionStats { private long st_region_wait; /** - The number of times that a thread of control was forced to wait - before obtaining the region lock. + The number of times that a thread of control was forced to wait before + obtaining the transaction region mutex. */ public long getRegionWait() { return st_region_wait; @@ -215,7 +215,7 @@ public class TransactionStats { private long st_region_nowait; /** The number of times that a thread of control was able to obtain the - region lock without waiting. + transaction region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; diff --git a/lang/java/src/com/sleepycat/db/TransactionStatus.java b/lang/java/src/com/sleepycat/db/TransactionStatus.java index ab1ee699..34efcac1 100644 --- a/lang/java/src/com/sleepycat/db/TransactionStatus.java +++ b/lang/java/src/com/sleepycat/db/TransactionStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VerboseConfig.java b/lang/java/src/com/sleepycat/db/VerboseConfig.java index 7f90a427..71ed1494 100644 --- a/lang/java/src/com/sleepycat/db/VerboseConfig.java +++ b/lang/java/src/com/sleepycat/db/VerboseConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VerifyConfig.java b/lang/java/src/com/sleepycat/db/VerifyConfig.java index 2843f890..6adb59ac 100644 --- a/lang/java/src/com/sleepycat/db/VerifyConfig.java +++ b/lang/java/src/com/sleepycat/db/VerifyConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VersionMismatchException.java b/lang/java/src/com/sleepycat/db/VersionMismatchException.java index 63c42777..16f17ae0 100644 --- a/lang/java/src/com/sleepycat/db/VersionMismatchException.java +++ b/lang/java/src/com/sleepycat/db/VersionMismatchException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/internal/Db.java b/lang/java/src/com/sleepycat/db/internal/Db.java index 941091b3..359792da 100644 --- a/lang/java/src/com/sleepycat/db/internal/Db.java +++ b/lang/java/src/com/sleepycat/db/internal/Db.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -364,6 +364,16 @@ public class Db { public int get_assoc_flags() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_assoc_flags(swigCPtr, this); } + public String get_blob_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_get_blob_dir(swigCPtr, this); + } + + public String get_blob_sub_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_get_blob_sub_dir(swigCPtr, this); + } + + public int get_blob_threshold() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_blob_threshold(swigCPtr, this); } + public boolean get_byteswapped() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_byteswapped(swigCPtr, this); } public long get_cachesize() throws com.sleepycat.db.DatabaseException { @@ -476,6 +486,10 @@ public class Db { public void set_append_recno(com.sleepycat.db.RecordNumberAppender db_append_recno_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_append_recno(swigCPtr, this, (append_recno_handler = db_append_recno_fcn) != null ); } + public void set_blob_dir(String dir) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_blob_dir(swigCPtr, this, dir); } + + public void set_blob_threshold(int bytes, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_blob_threshold(swigCPtr, this, bytes, flags); } + public void set_bt_compare(java.util.Comparator bt_compare_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_bt_compare(swigCPtr, this, (bt_compare_handler = bt_compare_fcn) != null ); } public void set_bt_minkey(int bt_minkey) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_bt_minkey(swigCPtr, this, bt_minkey); } @@ -512,6 +526,10 @@ public class Db { public void set_lorder(int lorder) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_lorder(swigCPtr, this, lorder); } + public int set_msgfile(String msgfile) /* no exception */ { + return db_javaJNI.Db_set_msgfile(swigCPtr, this, msgfile); + } + public void set_pagesize(long pagesize) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_pagesize(swigCPtr, this, pagesize); } public void set_partition(int parts, com.sleepycat.db.DatabaseEntry keys, com.sleepycat.db.PartitionHandler db_partition_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_partition(swigCPtr, this, parts, keys, (partition_handler = db_partition_fcn) != null ); } @@ -534,6 +552,10 @@ public class Db { public Object stat(DbTxn txnid, int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_stat(swigCPtr, this, DbTxn.getCPtr(txnid), txnid, flags); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_stat_print(swigCPtr, this, flags); + } + public void sync(int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_sync(swigCPtr, this, flags); } public int truncate(DbTxn txnid, int flags) throws com.sleepycat.db.DatabaseException { diff --git a/lang/java/src/com/sleepycat/db/internal/DbChannel.java b/lang/java/src/com/sleepycat/db/internal/DbChannel.java index f97e7aab..33c9fab8 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbChannel.java +++ b/lang/java/src/com/sleepycat/db/internal/DbChannel.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbConstants.java b/lang/java/src/com/sleepycat/db/internal/DbConstants.java index 4028514e..188b568b 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbConstants.java +++ b/lang/java/src/com/sleepycat/db/internal/DbConstants.java @@ -34,11 +34,12 @@ public interface DbConstants int DB_CREATE = 0x00000001; int DB_CURRENT = 6; int DB_CURSOR_BULK = 0x00000001; - int DB_DBT_BULK = 0x002; - int DB_DBT_MALLOC = 0x010; - int DB_DBT_PARTIAL = 0x040; - int DB_DBT_READONLY = 0x100; - int DB_DBT_USERMEM = 0x800; + int DB_DBT_BLOB = 0x1000; + int DB_DBT_BULK = 0x0002; + int DB_DBT_MALLOC = 0x0010; + int DB_DBT_PARTIAL = 0x0040; + int DB_DBT_READONLY = 0x0100; + int DB_DBT_USERMEM = 0x0800; int DB_DIRECT_DB = 0x00000200; int DB_DSYNC_DB = 0x00000400; int DB_DUP = 0x00000010; @@ -54,6 +55,7 @@ public interface DbConstants int DB_FLUSH = 0x00000002; int DB_FORCE = 0x00000001; int DB_FORCESYNC = 0x00000001; + int DB_FORCESYNCENV = 0x00000002; int DB_FOREIGN_ABORT = 0x00000001; int DB_FOREIGN_CASCADE = 0x00000002; int DB_FOREIGN_NULLIFY = 0x00000004; @@ -65,7 +67,6 @@ public interface DbConstants int DB_GROUP_CREATOR = 0x00000002; int DB_HASH = 2; int DB_HEAP = 6; - int DB_HEAP_FULL = -30996; int DB_HOTBACKUP_IN_PROGRESS = 0x00000800; int DB_IGNORE_LEASE = 0x00001000; int DB_IMMUTABLE_KEY = 0x00000002; @@ -110,10 +111,12 @@ public interface DbConstants int DB_LOCK_WRITE = 2; int DB_LOCK_YOUNGEST = 9; int DB_LOG_AUTO_REMOVE = 0x00000001; - int DB_LOG_DIRECT = 0x00000002; - int DB_LOG_DSYNC = 0x00000004; - int DB_LOG_IN_MEMORY = 0x00000008; - int DB_LOG_ZERO = 0x00000010; + int DB_LOG_BLOB = 0x00000002; + int DB_LOG_DIRECT = 0x00000004; + int DB_LOG_DSYNC = 0x00000008; + int DB_LOG_IN_MEMORY = 0x00000010; + int DB_LOG_NOSYNC = 0x00000020; + int DB_LOG_ZERO = 0x00000040; int DB_MEM_LOCK = 1; int DB_MEM_LOCKOBJECT = 2; int DB_MEM_LOCKER = 3; @@ -170,21 +173,24 @@ public interface DbConstants int DB_REPMGR_ACKS_QUORUM = 7; int DB_REPMGR_CONF_2SITE_STRICT = 0x00000001; int DB_REPMGR_CONF_ELECTIONS = 0x00000002; + int DB_REPMGR_CONF_PREFMAS_CLIENT = 0x00000004; + int DB_REPMGR_CONF_PREFMAS_MASTER = 0x00000008; int DB_REPMGR_CONNECTED = 1; int DB_REPMGR_DISCONNECTED = 2; int DB_REPMGR_NEED_RESPONSE = 0x00000001; int DB_REPMGR_ISPEER = 0x01; + int DB_REPMGR_ISVIEW = 0x02; int DB_REPMGR_PEER = 0x00000010; int DB_REP_ACK_TIMEOUT = 1; int DB_REP_ANYWHERE = 0x00000001; int DB_REP_CHECKPOINT_DELAY = 2; int DB_REP_CLIENT = 0x00000001; - int DB_REP_CONF_AUTOINIT = 0x00000004; - int DB_REP_CONF_BULK = 0x00000010; - int DB_REP_CONF_DELAYCLIENT = 0x00000020; - int DB_REP_CONF_INMEM = 0x00000040; - int DB_REP_CONF_LEASE = 0x00000080; - int DB_REP_CONF_NOWAIT = 0x00000100; + int DB_REP_CONF_AUTOINIT = 0x00000010; + int DB_REP_CONF_BULK = 0x00000040; + int DB_REP_CONF_DELAYCLIENT = 0x00000080; + int DB_REP_CONF_INMEM = 0x00000200; + int DB_REP_CONF_LEASE = 0x00000400; + int DB_REP_CONF_NOWAIT = 0x00000800; int DB_REP_CONNECTION_RETRY = 3; int DB_REP_DEFAULT_PRIORITY = 100; int DB_REP_ELECTION = 0x00000004; @@ -215,11 +221,14 @@ public interface DbConstants int DB_SET_TXN_TIMEOUT = 0x00000002; int DB_SNAPSHOT = 0x00000200; int DB_STAT_CLEAR = 0x00000001; + int DB_STREAM_READ = 0x00000001; + int DB_STREAM_SYNC_WRITE = 0x00000004; + int DB_STREAM_WRITE = 0x00000002; int DB_SYSTEM_MEM = 0x00080000; int DB_THREAD = 0x00000020; int DB_TIMEOUT = -30971; int DB_TIME_NOTGRANTED = 0x00040000; - int DB_TRUNCATE = 0x00020000; + int DB_TRUNCATE = 0x00040000; int DB_TXN_ABORT = 0; int DB_TXN_APPLY = 1; int DB_TXN_BACKWARD_ROLL = 3; @@ -242,23 +251,23 @@ public interface DbConstants int DB_VERB_DEADLOCK = 0x00000002; int DB_VERB_FILEOPS = 0x00000004; int DB_VERB_FILEOPS_ALL = 0x00000008; - int DB_VERB_RECOVERY = 0x00000010; - int DB_VERB_REGISTER = 0x00000020; - int DB_VERB_REPLICATION = 0x00000040; - int DB_VERB_REPMGR_CONNFAIL = 0x00000080; - int DB_VERB_REPMGR_MISC = 0x00000100; - int DB_VERB_REP_ELECT = 0x00000200; - int DB_VERB_REP_LEASE = 0x00000400; - int DB_VERB_REP_MISC = 0x00000800; - int DB_VERB_REP_MSGS = 0x00001000; - int DB_VERB_REP_SYNC = 0x00002000; - int DB_VERB_REP_SYSTEM = 0x00004000; - int DB_VERB_REP_TEST = 0x00008000; - int DB_VERB_WAITSFOR = 0x00010000; + int DB_VERB_RECOVERY = 0x00000020; + int DB_VERB_REGISTER = 0x00000040; + int DB_VERB_REPLICATION = 0x00000080; + int DB_VERB_REPMGR_CONNFAIL = 0x00000100; + int DB_VERB_REPMGR_MISC = 0x00000200; + int DB_VERB_REP_ELECT = 0x00000400; + int DB_VERB_REP_LEASE = 0x00000800; + int DB_VERB_REP_MISC = 0x00001000; + int DB_VERB_REP_MSGS = 0x00002000; + int DB_VERB_REP_SYNC = 0x00004000; + int DB_VERB_REP_SYSTEM = 0x00008000; + int DB_VERB_REP_TEST = 0x00010000; + int DB_VERB_WAITSFOR = 0x00020000; int DB_VERIFY = 0x00000002; - int DB_VERSION_MAJOR = 5; - int DB_VERSION_MINOR = 3; - int DB_VERSION_PATCH = 21; + int DB_VERSION_MAJOR = 6; + int DB_VERSION_MINOR = 1; + int DB_VERSION_PATCH = 23; int DB_WRITECURSOR = 0x00000010; int DB_YIELDCPU = 0x00080000; } diff --git a/lang/java/src/com/sleepycat/db/internal/DbEnv.java b/lang/java/src/com/sleepycat/db/internal/DbEnv.java index ad8b152f..3f3455c4 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbEnv.java +++ b/lang/java/src/com/sleepycat/db/internal/DbEnv.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -50,6 +50,7 @@ public class DbEnv { private String errpfx; private MessageHandler message_handler; private PanicHandler panic_handler; + private ReplicationViewHandler rep_view_handler; private ReplicationManagerMessageDispatch repmgr_msg_dispatch_handler; private ReplicationTransport rep_transport_handler; private java.io.OutputStream error_stream; @@ -107,6 +108,10 @@ public class DbEnv { event_notify_handler.handlePanicEvent(); } + private final void handle_rep_autotakeover_failed_event_notify() { + event_notify_handler.handleRepAutoTakeoverFailedEvent(); + } + private final void handle_rep_client_event_notify() { event_notify_handler.handleRepClientEvent(); } @@ -135,9 +140,13 @@ public class DbEnv { event_notify_handler.handleRepElectionFailedEvent(); } - private final void handle_rep_init_done_event_notify() { - event_notify_handler.handleRepInitDoneEvent(); - } + private final void handle_rep_init_done_event_notify() { + event_notify_handler.handleRepInitDoneEvent(); + } + + private final void handle_rep_inqueue_full_event_notify() { + event_notify_handler.handleRepInQueueFullEvent(); + } private final void handle_rep_join_failure_event_notify() { event_notify_handler.handleRepJoinFailureEvent(); @@ -255,6 +264,10 @@ public class DbEnv { return panic_handler; } + public final boolean handle_rep_view(String name, int flags) throws com.sleepycat.db.DatabaseException { + return rep_view_handler.partial_view(wrapper, name, flags); + } + private final int handle_rep_transport(DatabaseEntry control, DatabaseEntry rec, LogSequenceNumber lsn, @@ -373,6 +386,12 @@ public class DbEnv { public void fileid_reset(String file, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_fileid_reset(swigCPtr, this, file, flags); } + public String get_blob_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_get_blob_dir(swigCPtr, this); + } + + public int get_blob_threshold() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_blob_threshold(swigCPtr, this); } + public String[] get_data_dirs() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_data_dirs(swigCPtr, this); } public int get_encrypt_flags() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_encrypt_flags(swigCPtr, this); } @@ -409,6 +428,10 @@ public class DbEnv { /* package */ void remove0(String db_home, int flags) { db_javaJNI.DbEnv_remove0(swigCPtr, this, db_home, flags); } + public void set_blob_dir(String dir) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_blob_dir(swigCPtr, this, dir); } + + public void set_blob_threshold(int bytes, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_blob_threshold(swigCPtr, this, bytes, flags); } + public void set_cachesize(long bytes, int ncache) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_cachesize(swigCPtr, this, bytes, ncache); } public void set_cache_max(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_cache_max(swigCPtr, this, bytes); } @@ -445,6 +468,10 @@ public class DbEnv { db_javaJNI.DbEnv_set_msgcall(swigCPtr, this, (message_handler = db_msgcall_fcn) != null ); } + public int set_msgfile(String msgfile) /* no exception */ { + return db_javaJNI.DbEnv_set_msgfile(swigCPtr, this, msgfile); + } + public void set_paniccall(com.sleepycat.db.PanicHandler db_panic_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_paniccall(swigCPtr, this, (panic_handler = db_panic_fcn) != null ); } public void set_shm_key(long shm_key) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_shm_key(swigCPtr, this, shm_key); } @@ -502,6 +529,10 @@ public class DbEnv { public com.sleepycat.db.LockStats lock_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_lock_stat(swigCPtr, this, flags); } + public int lock_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_lock_stat_print(swigCPtr, this, flags); + } + public void set_lk_conflicts(byte[][] conflicts) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_lk_conflicts(swigCPtr, this, conflicts); } public void set_lk_detect(int detect) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_lk_detect(swigCPtr, this, detect); } @@ -563,6 +594,10 @@ public class DbEnv { public com.sleepycat.db.LogStats log_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_log_stat(swigCPtr, this, flags); } + public int log_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_log_stat_print(swigCPtr, this, flags); + } + public int log_verify(String envhome, int cachesz, String dbfile, String dbname, long stime, long etime, int stfile, int stoffset, int efile, int eoffset, int caf, int verbose) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_log_verify(swigCPtr, this, envhome, cachesz, dbfile, dbname, stime, etime, stfile, stoffset, efile, eoffset, caf, verbose); } @@ -615,6 +650,10 @@ public class DbEnv { public com.sleepycat.db.CacheStats memp_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_memp_stat(swigCPtr, this, flags); } + public int memp_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_memp_stat_print(swigCPtr, this, flags); + } + public com.sleepycat.db.CacheFileStats[] memp_fstat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_memp_fstat(swigCPtr, this, flags); } public void memp_sync(com.sleepycat.db.LogSequenceNumber lsn_or_null) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_memp_sync(swigCPtr, this, lsn_or_null); } @@ -645,12 +684,20 @@ public class DbEnv { public com.sleepycat.db.MutexStats mutex_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_mutex_stat(swigCPtr, this, flags); } + public int mutex_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_mutex_stat_print(swigCPtr, this, flags); + } + public int get_tx_max() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_tx_max(swigCPtr, this); } public long get_tx_timestamp() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_tx_timestamp(swigCPtr, this); } public long get_timeout(int flag) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_timeout(swigCPtr, this, flag); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_stat_print(swigCPtr, this, flags); + } + public int txn_applied(byte[] token, int maxwait, int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_txn_applied(swigCPtr, this, token, maxwait, flags); } @@ -666,6 +713,10 @@ public class DbEnv { public com.sleepycat.db.TransactionStats txn_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_txn_stat(swigCPtr, this, flags); } + public int txn_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_txn_stat_print(swigCPtr, this, flags); + } + public long rep_get_limit() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_limit(swigCPtr, this); } @@ -694,6 +745,10 @@ public class DbEnv { public com.sleepycat.db.ReplicationStats rep_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_stat(swigCPtr, this, flags); } + public int rep_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_rep_stat_print(swigCPtr, this, flags); + } + public void rep_set_limit(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_limit(swigCPtr, this, bytes); } public int rep_get_request_min() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_request_min(swigCPtr, this); } @@ -709,6 +764,8 @@ public class DbEnv { public void rep_set_transport(int envid, com.sleepycat.db.ReplicationTransport send) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_transport(swigCPtr, this, envid, (rep_transport_handler = send) != null ); } + public void rep_set_view(com.sleepycat.db.ReplicationViewHandler rep_view_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_view(swigCPtr, this, (rep_view_handler = rep_view_fcn) != null ); } + public int rep_get_nsites() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_nsites(swigCPtr, this); } public int rep_get_priority() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_priority(swigCPtr, this); } @@ -725,6 +782,10 @@ public class DbEnv { return db_javaJNI.DbEnv_repmgr_get_ack_policy(swigCPtr, this); } + public long repmgr_get_incoming_queue_max() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_repmgr_get_incoming_queue_max(swigCPtr, this); + } + public DbSite repmgr_local_site() throws com.sleepycat.db.DatabaseException { long cPtr = db_javaJNI.DbEnv_repmgr_local_site(swigCPtr, this); return (cPtr == 0) ? null : new DbSite(cPtr, false); @@ -732,6 +793,8 @@ public class DbEnv { public void repmgr_set_ack_policy(int policy) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_repmgr_set_ack_policy(swigCPtr, this, policy); } + public void repmgr_set_incoming_queue_max(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_repmgr_set_incoming_queue_max(swigCPtr, this, bytes); } + public DbSite repmgr_site(String host, long port) throws com.sleepycat.db.DatabaseException { long cPtr = db_javaJNI.DbEnv_repmgr_site(swigCPtr, this, host, port); return (cPtr == 0) ? null : new DbSite(cPtr, false); @@ -750,6 +813,10 @@ public class DbEnv { public com.sleepycat.db.ReplicationManagerStats repmgr_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_repmgr_stat(swigCPtr, this, flags); } + public int repmgr_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_repmgr_stat_print(swigCPtr, this, flags); + } + public int get_backup_config(int config_type) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_backup_config(swigCPtr, this, config_type); } public void backup(String target, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_backup(swigCPtr, this, target, flags); } diff --git a/lang/java/src/com/sleepycat/db/internal/DbLock.java b/lang/java/src/com/sleepycat/db/internal/DbLock.java index 8cd42c40..dd64dd85 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbLock.java +++ b/lang/java/src/com/sleepycat/db/internal/DbLock.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbLogc.java b/lang/java/src/com/sleepycat/db/internal/DbLogc.java index 3b9613dd..a833741f 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbLogc.java +++ b/lang/java/src/com/sleepycat/db/internal/DbLogc.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java b/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java index 2d05e67b..7ebedb2b 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java +++ b/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbSequence.java b/lang/java/src/com/sleepycat/db/internal/DbSequence.java index f4df2b16..38299b85 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbSequence.java +++ b/lang/java/src/com/sleepycat/db/internal/DbSequence.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -90,4 +90,8 @@ public class DbSequence { public com.sleepycat.db.SequenceStats stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbSequence_stat(swigCPtr, this, flags); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbSequence_stat_print(swigCPtr, this, flags); + } + } diff --git a/lang/java/src/com/sleepycat/db/internal/DbSite.java b/lang/java/src/com/sleepycat/db/internal/DbSite.java index 680a6fc7..5e5ff87c 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbSite.java +++ b/lang/java/src/com/sleepycat/db/internal/DbSite.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbStream.java b/lang/java/src/com/sleepycat/db/internal/DbStream.java new file mode 100644 index 00000000..aa666baf --- /dev/null +++ b/lang/java/src/com/sleepycat/db/internal/DbStream.java @@ -0,0 +1,59 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.12 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package com.sleepycat.db.internal; + +import com.sleepycat.db.*; +import java.util.Comparator; + +public class DbStream { + private long swigCPtr; + protected boolean swigCMemOwn; + + protected DbStream(long cPtr, boolean cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr(DbStream obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } + + /* package */ synchronized void delete() { + if (swigCPtr != 0) { + if (swigCMemOwn) { + swigCMemOwn = false; + throw new UnsupportedOperationException("C++ destructor does not have public access"); + } + swigCPtr = 0; + } + } + + public synchronized void close(int flags) throws DatabaseException { + try { + close0(flags); + } finally { + swigCPtr = 0; + } + } + + /* package */ void close0(int flags) { db_javaJNI.DbStream_close0(swigCPtr, this, flags); } + + public int read(com.sleepycat.db.DatabaseEntry data, long offset, int size, int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_read(swigCPtr, this, data, offset, size, flags); + } + + public long size(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_size(swigCPtr, this, flags); + } + + public int write(com.sleepycat.db.DatabaseEntry data, long offset, int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_write(swigCPtr, this, data, offset, flags); + } + +} diff --git a/lang/java/src/com/sleepycat/db/internal/DbTxn.java b/lang/java/src/com/sleepycat/db/internal/DbTxn.java index b24e8b15..0815f7ed 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbTxn.java +++ b/lang/java/src/com/sleepycat/db/internal/DbTxn.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbUtil.java b/lang/java/src/com/sleepycat/db/internal/DbUtil.java index 83d6d65e..eae4dda8 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbUtil.java +++ b/lang/java/src/com/sleepycat/db/internal/DbUtil.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/internal/Dbc.java b/lang/java/src/com/sleepycat/db/internal/Dbc.java index b74f41d7..5dd47fe2 100644 --- a/lang/java/src/com/sleepycat/db/internal/Dbc.java +++ b/lang/java/src/com/sleepycat/db/internal/Dbc.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -50,6 +50,11 @@ public class Dbc { public int count(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Dbc_count(swigCPtr, this, flags); } + public DbStream db_stream(int flags) throws com.sleepycat.db.DatabaseException { + long cPtr = db_javaJNI.Dbc_db_stream(swigCPtr, this, flags); + return (cPtr == 0) ? null : new DbStream(cPtr, false); + } + public int del(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Dbc_del(swigCPtr, this, flags); } diff --git a/lang/java/src/com/sleepycat/db/internal/db_java.java b/lang/java/src/com/sleepycat/db/internal/db_java.java index 373ae5a3..01d40188 100644 --- a/lang/java/src/com/sleepycat/db/internal/db_java.java +++ b/lang/java/src/com/sleepycat/db/internal/db_java.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java b/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java index 8432d409..bb26fa91 100644 --- a/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java +++ b/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -88,6 +88,9 @@ class db_javaJNI { public final static native int Db_exists(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, com.sleepycat.db.DatabaseEntry jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native int Db_get(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, com.sleepycat.db.DatabaseEntry jarg3, com.sleepycat.db.DatabaseEntry jarg4, int jarg5) throws com.sleepycat.db.DatabaseException; public final static native int Db_get_assoc_flags(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native String Db_get_blob_dir(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native String Db_get_blob_sub_dir(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native int Db_get_blob_threshold(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native boolean Db_get_byteswapped(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long Db_get_cachesize(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int Db_get_cachesize_ncache(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; @@ -126,6 +129,8 @@ class db_javaJNI { /* package */ final static native void Db_remove0(long jarg1, Db jarg1_, String jarg2, String jarg3, int jarg4); /* package */ final static native void Db_rename0(long jarg1, Db jarg1_, String jarg2, String jarg3, String jarg4, int jarg5); public final static native void Db_set_append_recno(long jarg1, Db jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void Db_set_blob_dir(long jarg1, Db jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void Db_set_blob_threshold(long jarg1, Db jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_compare(long jarg1, Db jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_minkey(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_compress(long jarg1, Db jarg1_, boolean jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; @@ -144,6 +149,7 @@ class db_javaJNI { public final static native void Db_set_h_nelem(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_lk_exclusive(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_lorder(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int Db_set_msgfile(long jarg1, Db jarg1_, String jarg2) /* no exception */; public final static native void Db_set_pagesize(long jarg1, Db jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_partition(long jarg1, Db jarg1_, int jarg2, com.sleepycat.db.DatabaseEntry jarg3, boolean jarg4) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_partition_dirs(long jarg1, Db jarg1_, String[] jarg2) throws com.sleepycat.db.DatabaseException; @@ -155,6 +161,7 @@ class db_javaJNI { public final static native void Db_set_q_extentsize(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_sort_multiple(long jarg1, Db jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3) throws com.sleepycat.db.DatabaseException; public final static native Object Db_stat(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; + public final static native int Db_stat_print(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_sync(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Db_truncate(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void Db_upgrade(long jarg1, Db jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; @@ -162,6 +169,7 @@ class db_javaJNI { /* package */ final static native void Dbc_close0(long jarg1, Dbc jarg1_); public final static native int Dbc_cmp(long jarg1, Dbc jarg1_, long jarg2, Dbc jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_count(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native long Dbc_db_stream(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_del(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native long Dbc_dup(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_get(long jarg1, Dbc jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; @@ -177,6 +185,8 @@ class db_javaJNI { public final static native void DbEnv_errx(long jarg1, DbEnv jarg1_, String jarg2) /* no exception */; public final static native long DbEnv_cdsgroup_begin(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_fileid_reset(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; + public final static native String DbEnv_get_blob_dir(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_get_blob_threshold(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native String[] DbEnv_get_data_dirs(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_encrypt_flags(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_flags(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; @@ -191,6 +201,8 @@ class db_javaJNI { public final static native void DbEnv_lsn_reset(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_open(long jarg1, DbEnv jarg1_, String jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException, java.io.FileNotFoundException; /* package */ final static native void DbEnv_remove0(long jarg1, DbEnv jarg1_, String jarg2, int jarg3); + public final static native void DbEnv_set_blob_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_set_blob_threshold(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_cachesize(long jarg1, DbEnv jarg1_, long jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_cache_max(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_create_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; @@ -207,6 +219,7 @@ class db_javaJNI { public final static native void DbEnv_set_mp_pagesize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_mp_tablesize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_msgcall(long jarg1, DbEnv jarg1_, boolean jarg2) /* no exception */; + public final static native int DbEnv_set_msgfile(long jarg1, DbEnv jarg1_, String jarg2) /* no exception */; public final static native void DbEnv_set_paniccall(long jarg1, DbEnv jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_shm_key(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_timeout(long jarg1, DbEnv jarg1_, long jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; @@ -232,6 +245,7 @@ class db_javaJNI { public final static native void DbEnv_lock_id_free(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_lock_put(long jarg1, DbEnv jarg1_, long jarg2, DbLock jarg2_) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.LockStats DbEnv_lock_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_lock_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_conflicts(long jarg1, DbEnv jarg1_, byte[][] jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_detect(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_max_lockers(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -257,6 +271,7 @@ class db_javaJNI { public final static native void DbEnv_log_print(long jarg1, DbEnv jarg1_, long jarg2, DbTxn jarg2_, String jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_log_set_config(long jarg1, DbEnv jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.LogStats DbEnv_log_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_log_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_log_verify(long jarg1, DbEnv jarg1_, String jarg2, int jarg3, String jarg4, String jarg5, long jarg6, long jarg7, int jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lg_bsize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lg_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; @@ -274,6 +289,7 @@ class db_javaJNI { public final static native int DbEnv_get_mp_pagesize(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_mp_tablesize(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.CacheStats DbEnv_memp_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_memp_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.CacheFileStats[] DbEnv_memp_fstat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_memp_sync(long jarg1, DbEnv jarg1_, com.sleepycat.db.LogSequenceNumber jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_memp_trickle(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -288,14 +304,17 @@ class db_javaJNI { public final static native void DbEnv_mutex_set_max(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_mutex_set_tas_spins(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.MutexStats DbEnv_mutex_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_mutex_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_tx_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_get_tx_timestamp(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_get_timeout(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_txn_applied(long jarg1, DbEnv jarg1_, byte[] jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_txn_begin(long jarg1, DbEnv jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_txn_checkpoint(long jarg1, DbEnv jarg1_, int jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.PreparedTransaction[] DbEnv_txn_recover(long jarg1, DbEnv jarg1_, long jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.TransactionStats DbEnv_txn_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_txn_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_rep_get_limit(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_elect(long jarg1, DbEnv jarg1_, int jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_process_message(long jarg1, DbEnv jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3, int jarg4, com.sleepycat.db.LogSequenceNumber jarg5) /* no exception */; @@ -308,12 +327,14 @@ class db_javaJNI { public final static native void DbEnv_rep_sync(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native boolean DbEnv_rep_get_config(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationStats DbEnv_rep_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_rep_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_limit(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_request_min(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_request_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_channel(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_request(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_transport(long jarg1, DbEnv jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_rep_set_view(long jarg1, DbEnv jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_nsites(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_priority(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_timeout(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -321,14 +342,17 @@ class db_javaJNI { public final static native void DbEnv_rep_set_priority(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_timeout(long jarg1, DbEnv jarg1_, int jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_repmgr_get_ack_policy(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native long DbEnv_repmgr_get_incoming_queue_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_local_site(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_set_ack_policy(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_repmgr_set_incoming_queue_max(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_site(long jarg1, DbEnv jarg1_, String jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_site_by_eid(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_set_dispatch(long jarg1, DbEnv jarg1_, boolean jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationManagerSiteInfo[] DbEnv_repmgr_site_list(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_start(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationManagerStats DbEnv_repmgr_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_repmgr_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_backup_config(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_backup(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_dbbackup(long jarg1, DbEnv jarg1_, String jarg2, String jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; @@ -368,12 +392,17 @@ class db_javaJNI { public final static native void DbSequence_set_flags(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbSequence_set_range(long jarg1, DbSequence jarg1_, long jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.SequenceStats DbSequence_stat(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbSequence_stat_print(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbSite_close0(long jarg1, DbSite jarg1_); public final static native com.sleepycat.db.ReplicationHostAddress DbSite_get_address(long jarg1, DbSite jarg1_) throws com.sleepycat.db.DatabaseException; public final static native boolean DbSite_get_config(long jarg1, DbSite jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbSite_get_eid(long jarg1, DbSite jarg1_) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbSite_remove0(long jarg1, DbSite jarg1_); public final static native void DbSite_set_config(long jarg1, DbSite jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; + /* package */ final static native void DbStream_close0(long jarg1, DbStream jarg1_, int jarg2); + public final static native int DbStream_read(long jarg1, DbStream jarg1_, com.sleepycat.db.DatabaseEntry jarg2, long jarg3, int jarg4, int jarg5) throws com.sleepycat.db.DatabaseException; + public final static native long DbStream_size(long jarg1, DbStream jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbStream_write(long jarg1, DbStream jarg1_, com.sleepycat.db.DatabaseEntry jarg2, long jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbTxn_abort0(long jarg1, DbTxn jarg1_); /* package */ final static native void DbTxn_discard0(long jarg1, DbTxn jarg1_, int jarg2); public final static native String DbTxn_get_name(long jarg1, DbTxn jarg1_) throws com.sleepycat.db.DatabaseException; diff --git a/lang/java/src/com/sleepycat/db/package.html b/lang/java/src/com/sleepycat/db/package.html index 8e00efdf..305e6362 100644 --- a/lang/java/src/com/sleepycat/db/package.html +++ b/lang/java/src/com/sleepycat/db/package.html @@ -5,7 +5,7 @@ See the file LICENSE for redistribution information. - Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. $Id$ diff --git a/lang/java/src/com/sleepycat/persist/BasicCursor.java b/lang/java/src/com/sleepycat/persist/BasicCursor.java index c5291484..22b7f27e 100644 --- a/lang/java/src/com/sleepycat/persist/BasicCursor.java +++ b/lang/java/src/com/sleepycat/persist/BasicCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/BasicIndex.java b/lang/java/src/com/sleepycat/persist/BasicIndex.java index 19abf98b..ecc4742a 100644 --- a/lang/java/src/com/sleepycat/persist/BasicIndex.java +++ b/lang/java/src/com/sleepycat/persist/BasicIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/BasicIterator.java b/lang/java/src/com/sleepycat/persist/BasicIterator.java index e87d2212..7b01e93d 100644 --- a/lang/java/src/com/sleepycat/persist/BasicIterator.java +++ b/lang/java/src/com/sleepycat/persist/BasicIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/DataValueAdapter.java b/lang/java/src/com/sleepycat/persist/DataValueAdapter.java index 2c2c1b02..f82a00c6 100644 --- a/lang/java/src/com/sleepycat/persist/DataValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/DataValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/DatabaseNamer.java b/lang/java/src/com/sleepycat/persist/DatabaseNamer.java index f5137acc..a398a07e 100644 --- a/lang/java/src/com/sleepycat/persist/DatabaseNamer.java +++ b/lang/java/src/com/sleepycat/persist/DatabaseNamer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityCursor.java b/lang/java/src/com/sleepycat/persist/EntityCursor.java index a255b942..9e74760b 100644 --- a/lang/java/src/com/sleepycat/persist/EntityCursor.java +++ b/lang/java/src/com/sleepycat/persist/EntityCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityIndex.java b/lang/java/src/com/sleepycat/persist/EntityIndex.java index 32181483..4f280a15 100644 --- a/lang/java/src/com/sleepycat/persist/EntityIndex.java +++ b/lang/java/src/com/sleepycat/persist/EntityIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityJoin.java b/lang/java/src/com/sleepycat/persist/EntityJoin.java index 447cccd9..4863dd32 100644 --- a/lang/java/src/com/sleepycat/persist/EntityJoin.java +++ b/lang/java/src/com/sleepycat/persist/EntityJoin.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityStore.java b/lang/java/src/com/sleepycat/persist/EntityStore.java index b2e25477..ca8afeb7 100644 --- a/lang/java/src/com/sleepycat/persist/EntityStore.java +++ b/lang/java/src/com/sleepycat/persist/EntityStore.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java b/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java index d4d57172..83cd157c 100644 --- a/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/ForwardCursor.java b/lang/java/src/com/sleepycat/persist/ForwardCursor.java index 144df6fb..b6778818 100644 --- a/lang/java/src/com/sleepycat/persist/ForwardCursor.java +++ b/lang/java/src/com/sleepycat/persist/ForwardCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java b/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java index b9a7a503..f805dc7f 100644 --- a/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java +++ b/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeySelector.java b/lang/java/src/com/sleepycat/persist/KeySelector.java index 70cdd8ef..dd9f1ec5 100644 --- a/lang/java/src/com/sleepycat/persist/KeySelector.java +++ b/lang/java/src/com/sleepycat/persist/KeySelector.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java b/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java index 4d8ed2e6..f6e9c915 100644 --- a/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeysIndex.java b/lang/java/src/com/sleepycat/persist/KeysIndex.java index a3aba5f9..87db9442 100644 --- a/lang/java/src/com/sleepycat/persist/KeysIndex.java +++ b/lang/java/src/com/sleepycat/persist/KeysIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/PrimaryIndex.java b/lang/java/src/com/sleepycat/persist/PrimaryIndex.java index 2d988a20..0552a5f6 100644 --- a/lang/java/src/com/sleepycat/persist/PrimaryIndex.java +++ b/lang/java/src/com/sleepycat/persist/PrimaryIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -564,7 +564,6 @@ public class PrimaryIndex<PK, E> extends BasicIndex<PK, E> { } /** - * @hidden * For internal use only. * * Used for obtaining the auto-commit txn config from the store, which diff --git a/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java b/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java index 0706f69f..c2f770e8 100644 --- a/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/SecondaryIndex.java b/lang/java/src/com/sleepycat/persist/SecondaryIndex.java index 3bf819b2..d931ca24 100644 --- a/lang/java/src/com/sleepycat/persist/SecondaryIndex.java +++ b/lang/java/src/com/sleepycat/persist/SecondaryIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -978,7 +978,6 @@ public class SecondaryIndex<SK, PK, E> extends BasicIndex<SK, E> { } /** - * @hidden * For internal use only. * * Used for obtaining the auto-commit txn config from the store, which diff --git a/lang/java/src/com/sleepycat/persist/StoreConfig.java b/lang/java/src/com/sleepycat/persist/StoreConfig.java index 1a5fa39d..d7f42ee9 100644 --- a/lang/java/src/com/sleepycat/persist/StoreConfig.java +++ b/lang/java/src/com/sleepycat/persist/StoreConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -90,7 +90,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setAllowCreateVoid(boolean allowCreate) { @@ -118,7 +117,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setExclusiveCreateVoid(boolean exclusiveCreate) { @@ -146,7 +144,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setTransactionalVoid(boolean transactional) { @@ -174,7 +171,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setReadOnlyVoid(boolean readOnly) { @@ -222,7 +218,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setSecondaryBulkLoadVoid(boolean secondaryBulkLoad) { @@ -248,7 +243,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setModelVoid(EntityModel model) { @@ -288,7 +282,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setMutationsVoid(Mutations mutations) { @@ -316,7 +309,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setDatabaseNamerVoid(DatabaseNamer databaseNamer) { diff --git a/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java b/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java index 8acd27d7..0ebdf01f 100644 --- a/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java +++ b/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/StoreExistsException.java b/lang/java/src/com/sleepycat/persist/StoreExistsException.java index 7c6886f3..d5977b2d 100644 --- a/lang/java/src/com/sleepycat/persist/StoreExistsException.java +++ b/lang/java/src/com/sleepycat/persist/StoreExistsException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: StoreExistsException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java b/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java index ccc70d96..59b1e369 100644 --- a/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java +++ b/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: StoreNotFoundException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/SubIndex.java b/lang/java/src/com/sleepycat/persist/SubIndex.java index 117c3071..fcf28c4a 100644 --- a/lang/java/src/com/sleepycat/persist/SubIndex.java +++ b/lang/java/src/com/sleepycat/persist/SubIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/SubIndexCursor.java b/lang/java/src/com/sleepycat/persist/SubIndexCursor.java index 4fc215e4..7a3150fb 100644 --- a/lang/java/src/com/sleepycat/persist/SubIndexCursor.java +++ b/lang/java/src/com/sleepycat/persist/SubIndexCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/ValueAdapter.java b/lang/java/src/com/sleepycat/persist/ValueAdapter.java index 8e234081..9898f6ae 100644 --- a/lang/java/src/com/sleepycat/persist/ValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/ValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Conversion.java b/lang/java/src/com/sleepycat/persist/evolve/Conversion.java index ebc33f5d..ffb682ae 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Conversion.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Conversion.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Converter.java b/lang/java/src/com/sleepycat/persist/evolve/Converter.java index b5aed18a..9d93788c 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Converter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Converter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java b/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java index a38ba2a5..5b48883d 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java +++ b/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: DeletedClassException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Deleter.java b/lang/java/src/com/sleepycat/persist/evolve/Deleter.java index cbe3d5a3..db64d780 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Deleter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Deleter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java b/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java index 07d5157e..d20adcb0 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java index 461ac314..7d5d6d0e 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -83,7 +83,6 @@ public class EvolveConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setEvolveListenerVoid(EvolveListener listener) { diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java index 4500e805..ab131d76 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java index 692d60af..603704ce 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java index 77713b68..680c7ad8 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java index 828fec8b..a1458259 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java index e5b64148..ee12021d 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java b/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java index 7decfc3a..31394adb 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java +++ b/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: IncompatibleClassException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Mutation.java b/lang/java/src/com/sleepycat/persist/evolve/Mutation.java index 08431c27..abd4c486 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Mutation.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Mutation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Mutations.java b/lang/java/src/com/sleepycat/persist/evolve/Mutations.java index 54326b2f..f6740bb5 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Mutations.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Mutations.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Renamer.java b/lang/java/src/com/sleepycat/persist/evolve/Renamer.java index 1ef76019..ee08e570 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Renamer.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Renamer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/package.html b/lang/java/src/com/sleepycat/persist/evolve/package.html index b5aa9ba3..b4bc338c 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/package.html +++ b/lang/java/src/com/sleepycat/persist/evolve/package.html @@ -63,9 +63,9 @@ compatibly; for such changes a class Converter mutation is required.</p> <p>Changes to field types in entity class definitions are compatible when they conform to the Java Language Specification definitions for <a -href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html#5.1.2">Widening +href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-5.html#jls-5.1.2">Widening Primitive Conversions</a> and <a -href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html#5.1.5">Widening +href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-5.html#jls-5.1.5">Widening Reference Conversions</a>. For example, a smaller integer type may be changed to a larger integer type, and a reference type may be changed to one of its supertypes. Automatic widening conversions are performed diff --git a/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java b/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java index 045118b7..87801076 100644 --- a/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Accessor.java b/lang/java/src/com/sleepycat/persist/impl/Accessor.java index c0e8551e..b41431b9 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Accessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/Accessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Catalog.java b/lang/java/src/com/sleepycat/persist/impl/Catalog.java index fb41b117..4c7a9a61 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Catalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/Catalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java b/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java index bc4fcf4d..e58f95a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java +++ b/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java b/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java index 8cb5e96d..580e6d63 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java b/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java index 61247cca..4b8318d7 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java b/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java index cf95a3b9..19e8310b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java b/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java index a67b2f2b..6c69c93d 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java +++ b/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Enhanced.java b/lang/java/src/com/sleepycat/persist/impl/Enhanced.java index 756e3631..de087e30 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Enhanced.java +++ b/lang/java/src/com/sleepycat/persist/impl/Enhanced.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java b/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java index 5fedb0b3..575feae3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EntityInput.java b/lang/java/src/com/sleepycat/persist/impl/EntityInput.java index 0010d427..13773cb5 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EntityInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/EntityInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java b/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java index 252f1631..9b3b0e0c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java +++ b/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java b/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java index 4b292f1a..b6136de4 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Evolver.java b/lang/java/src/com/sleepycat/persist/impl/Evolver.java index b1d180b7..f4cd155c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Evolver.java +++ b/lang/java/src/com/sleepycat/persist/impl/Evolver.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -355,8 +355,8 @@ class Evolver { return false; } if (oldLatestFormat == oldLatestFormat.getLatestVersion()) { - assert !newFormats.containsValue(newFormat) : newFormat; - /* newFormat equals oldLatestFormat and was discarded. */ + /* newFormat is no longer relevant [#21869]. */ + newFormats.remove(newFormat.getClassName()); newFormat = oldLatestFormat; } } diff --git a/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java b/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java index 1e14193c..5020473c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java +++ b/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Format.java b/lang/java/src/com/sleepycat/persist/impl/Format.java index 060beeb7..8c614d1f 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Format.java +++ b/lang/java/src/com/sleepycat/persist/impl/Format.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java b/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java index c9ac5bbc..a1460dce 100644 --- a/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java +++ b/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/MapProxy.java b/lang/java/src/com/sleepycat/persist/impl/MapProxy.java index 9b55fff5..b4094007 100644 --- a/lang/java/src/com/sleepycat/persist/impl/MapProxy.java +++ b/lang/java/src/com/sleepycat/persist/impl/MapProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java b/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java index d2217a77..16fcc578 100644 --- a/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java b/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java index 58716811..5ad772a3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java b/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java index 1f5e3b37..2c7225ee 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java b/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java index aff47fd5..eb4a50a2 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java b/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java index 3e03356d..ddb1dc99 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java index 940b25e9..7cdd8233 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java index 05b441fc..0514a470 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java index 00725bb8..95b4297a 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java b/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java index f890a89a..fd3fdd58 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java b/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java index 1a9af940..37b309f8 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java b/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java index cc0f180f..c2234586 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java b/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java index cb327f1e..2164c92d 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java b/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java index 8907bc1a..1cadb91a 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java b/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java index 0999cd6b..9955a33b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java b/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java index 4159b6b1..9b342a62 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java b/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java index 7892878d..59dedabc 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Reader.java b/lang/java/src/com/sleepycat/persist/impl/Reader.java index b5058273..bb1755cc 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Reader.java +++ b/lang/java/src/com/sleepycat/persist/impl/Reader.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RecordInput.java b/lang/java/src/com/sleepycat/persist/impl/RecordInput.java index bdd13aff..55dd7fc8 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RecordInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RecordInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java b/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java index 36e2a029..e9022959 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java b/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java index e8c2e61c..11c1761f 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RefreshException.java b/lang/java/src/com/sleepycat/persist/impl/RefreshException.java index ffdadfb2..b8df07b3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RefreshException.java +++ b/lang/java/src/com/sleepycat/persist/impl/RefreshException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java b/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java index f021420d..a2a9a4a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java b/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java index d83f19e4..3a7364f4 100644 --- a/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Store.java b/lang/java/src/com/sleepycat/persist/impl/Store.java index 895ad968..164613a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Store.java +++ b/lang/java/src/com/sleepycat/persist/impl/Store.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/StoredModel.java b/lang/java/src/com/sleepycat/persist/impl/StoredModel.java index 725a5748..b764331b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/StoredModel.java +++ b/lang/java/src/com/sleepycat/persist/impl/StoredModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java b/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java index aee70255..959ba082 100644 --- a/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java +++ b/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: VisitedObjects.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java b/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java index 752f136b..5fb1a0ef 100644 --- a/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java b/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java index c98e498e..06b3ca03 100644 --- a/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java +++ b/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java b/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java index d58e78b4..8848a4af 100644 --- a/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java +++ b/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java b/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java index 61d4b985..7c5e4c4c 100644 --- a/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java +++ b/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java b/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java index 6a6dec3d..d146aa45 100644 --- a/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/DeleteAction.java b/lang/java/src/com/sleepycat/persist/model/DeleteAction.java index e4b2fb3b..d19b80bf 100644 --- a/lang/java/src/com/sleepycat/persist/model/DeleteAction.java +++ b/lang/java/src/com/sleepycat/persist/model/DeleteAction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Entity.java b/lang/java/src/com/sleepycat/persist/model/Entity.java index bb0bfe5b..b540f169 100644 --- a/lang/java/src/com/sleepycat/persist/model/Entity.java +++ b/lang/java/src/com/sleepycat/persist/model/Entity.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java b/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java index 89218ff7..184afca2 100644 --- a/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/EntityModel.java b/lang/java/src/com/sleepycat/persist/model/EntityModel.java index 70c27316..8a3e258f 100644 --- a/lang/java/src/com/sleepycat/persist/model/EntityModel.java +++ b/lang/java/src/com/sleepycat/persist/model/EntityModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java b/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java index 835ddb18..09dee292 100644 --- a/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/KeyField.java b/lang/java/src/com/sleepycat/persist/model/KeyField.java index b0b5567f..506fdedc 100644 --- a/lang/java/src/com/sleepycat/persist/model/KeyField.java +++ b/lang/java/src/com/sleepycat/persist/model/KeyField.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ModelInternal.java b/lang/java/src/com/sleepycat/persist/model/ModelInternal.java index 65cd416c..686f2e9c 100644 --- a/lang/java/src/com/sleepycat/persist/model/ModelInternal.java +++ b/lang/java/src/com/sleepycat/persist/model/ModelInternal.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/NotPersistent.java b/lang/java/src/com/sleepycat/persist/model/NotPersistent.java index c6105fa1..7cefd374 100644 --- a/lang/java/src/com/sleepycat/persist/model/NotPersistent.java +++ b/lang/java/src/com/sleepycat/persist/model/NotPersistent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/NotTransient.java b/lang/java/src/com/sleepycat/persist/model/NotTransient.java index 44a81066..2f4bf313 100644 --- a/lang/java/src/com/sleepycat/persist/model/NotTransient.java +++ b/lang/java/src/com/sleepycat/persist/model/NotTransient.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Persistent.java b/lang/java/src/com/sleepycat/persist/model/Persistent.java index 5988655f..98595f08 100644 --- a/lang/java/src/com/sleepycat/persist/model/Persistent.java +++ b/lang/java/src/com/sleepycat/persist/model/Persistent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java b/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java index 88d94a20..14855756 100644 --- a/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java +++ b/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java b/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java index b8cc7f0e..9fb05658 100644 --- a/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java +++ b/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java b/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java index b9ca8dff..122279c2 100644 --- a/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Relationship.java b/lang/java/src/com/sleepycat/persist/model/Relationship.java index 3877519d..f4b89efe 100644 --- a/lang/java/src/com/sleepycat/persist/model/Relationship.java +++ b/lang/java/src/com/sleepycat/persist/model/Relationship.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java b/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java index d2e096a0..93d79d74 100644 --- a/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java +++ b/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java b/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java index 24bea808..1641f279 100644 --- a/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawField.java b/lang/java/src/com/sleepycat/persist/raw/RawField.java index e4c566fb..31f4b750 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawField.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawField.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawObject.java b/lang/java/src/com/sleepycat/persist/raw/RawObject.java index efb6c707..0cdc953c 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawObject.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawObject.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawStore.java b/lang/java/src/com/sleepycat/persist/raw/RawStore.java index 4b8c9bae..116c9375 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawStore.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawStore.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawType.java b/lang/java/src/com/sleepycat/persist/raw/RawType.java index c3063f45..3421bb4d 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawType.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ClassResolver.java b/lang/java/src/com/sleepycat/util/ClassResolver.java index 2438557f..35f27765 100644 --- a/lang/java/src/com/sleepycat/util/ClassResolver.java +++ b/lang/java/src/com/sleepycat/util/ClassResolver.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java b/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java index 0b5128bf..e51389e7 100644 --- a/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java +++ b/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -17,33 +17,33 @@ import java.util.ArrayList; /* * If someone add a property in some FooConfig.java, - * (1) If the setter/getter methods are setFoo/getFoo, the name of the + * (1) If the setter/getter methods are setFoo/getFoo, the name of the * property should be "foo", which means the first letter of the property * name should be lower case. - * (2) The setter method for this property setProperty should return "this", + * (2) The setter method for this property setProperty should return "this", * and setPropertyVoid method which returns void value must be added. - * The return type of the getter method should be the same as the + * The return type of the getter method should be the same as the * parameter of the setter method. - * (3) The setter method and getter method must be added into + * (3) The setter method and getter method must be added into * FooConfigBeanInfo; - * (4) If for some of the setter methods in the FooConfig.java, setterVoid - * methods are not necessary, then add the name of such setter methods - * into the ArrayList ignoreMethods within the corresponding - * FooConfigBeanInfo.getPropertyDescriptors method. For example, - * setMaxSeedTestHook method in DiskOrderedCursorConfig.java is only used - * for unit tests, so "setMaxSeedTestHook" is added into ignoreMethods + * (4) If for some of the setter methods in the FooConfig.java, setterVoid + * methods are not necessary, then add the name of such setter methods + * into the ArrayList ignoreMethods within the corresponding + * FooConfigBeanInfo.getPropertyDescriptors method. For example, + * setMaxSeedTestHook method in DiskOrderedCursorConfig.java is only used + * for unit tests, so "setMaxSeedTestHook" is added into ignoreMethods * list within DiskOrderedCursorConfigBeanInfo.getPropertyDescriptors. - * + * * * If someone adds a new FooConfig.java, * (1) The definition of setter/getter mehods and the names of the properties - * should follow the rules described above. + * should follow the rules described above. * (2) There must be FooConfigBeanInfo.java. You can write it according to * the current beaninfo classes. - * (3) "PackagePath.FooConfig" must be added into the unit test: + * (3) "PackagePath.FooConfig" must be added into the unit test: * com.sleepycat.db.ConfigBeanInfoTest. * - * If someond remove an existing FooConfig.java, then "PackagePath.FooConfig" + * If someond remove an existing FooConfig.java, then "PackagePath.FooConfig" * must be deleted in the unit test com.sleepycat.db.ConfigBeanInfoTest. */ public class ConfigBeanInfoBase extends SimpleBeanInfo { @@ -58,22 +58,22 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { private static final int defaultPropertyIndex = -1; private static final int defaultEventIndex = -1; - + protected static ArrayList<String> propertiesName = new ArrayList<String>(); - protected static ArrayList<String> + protected static ArrayList<String> getterAndSetterMethods = new ArrayList<String>(); - + protected static ArrayList<String> ignoreMethods = new ArrayList<String>(); - - /* - * Get the propertis' infomation, including all the properties's names + + /* + * Get the propertis' infomation, including all the properties's names * and their getter/setter methods. */ - protected static void getPropertiesInfo(Class cls) { + protected static void getPropertiesInfo(Class cls) { propertiesName.clear(); getterAndSetterMethods.clear(); try { - + /* Get all of the public methods. */ ArrayList<String> allMethodNames = new ArrayList<String>(); Method[] methods = cls.getMethods(); @@ -83,7 +83,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { for (int i = 0; i < allMethodNames.size(); i++) { String name = allMethodNames.get(i); String subName = name.substring(0, 3); - + /* If it is a setter method. */ if (subName.equals("set")) { if (isIgnoreMethods(name)) { @@ -96,18 +96,18 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } catch (NoSuchMethodException e) { getterMethod = null; } - if (getterMethod != null) { + if (getterMethod != null) { getterAndSetterMethods.add("get" + propertyName); getterAndSetterMethods.add(name + "Void"); - - /* - * Add the real property name into propertiesName. - * if the names of setter/getter methods are - * setFoo/getFoo, the name of the property should be + + /* + * Add the real property name into propertiesName. + * if the names of setter/getter methods are + * setFoo/getFoo, the name of the property should be * "foo". */ propertiesName.add - (propertyName.substring(0, 1).toLowerCase() + + (propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1)); } } @@ -116,7 +116,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { e.printStackTrace(); } } - + private static boolean isIgnoreMethods(String methodName) { for (int i = 0; i < ignoreMethods.size(); i++) { if (ignoreMethods.get(i).equals(methodName)) { @@ -125,16 +125,16 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } return false; } - + protected static PropertyDescriptor[] getPdescriptor(Class cls) { getPropertiesInfo(cls); final int propertyNum = propertiesName.size(); assert propertyNum * 2 == getterAndSetterMethods.size(); - PropertyDescriptor[] properties = new PropertyDescriptor[propertyNum]; + PropertyDescriptor[] properties = new PropertyDescriptor[propertyNum]; try { for (int i = 0, j = 0; i < propertyNum; i += 1, j += 2) { properties[i] = new PropertyDescriptor - (propertiesName.get(i), cls, getterAndSetterMethods.get(j), + (propertiesName.get(i), cls, getterAndSetterMethods.get(j), getterAndSetterMethods.get(j + 1)); } } catch(IntrospectionException e) { @@ -142,7 +142,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } return properties; } - + protected static BeanDescriptor getBdescriptor(Class cls) { BeanDescriptor beanDescriptor = new BeanDescriptor(cls, null); return beanDescriptor; diff --git a/lang/java/src/com/sleepycat/util/ErrorBuffer.java b/lang/java/src/com/sleepycat/util/ErrorBuffer.java index 82757c80..1d10672a 100644 --- a/lang/java/src/com/sleepycat/util/ErrorBuffer.java +++ b/lang/java/src/com/sleepycat/util/ErrorBuffer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: ErrorBuffer.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java b/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java index f8a0204d..aaccc383 100644 --- a/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java +++ b/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ExceptionWrapper.java b/lang/java/src/com/sleepycat/util/ExceptionWrapper.java index 689dc3b7..ac3f63ce 100644 --- a/lang/java/src/com/sleepycat/util/ExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/ExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/FastInputStream.java b/lang/java/src/com/sleepycat/util/FastInputStream.java index 86e7fac4..1bacba58 100644 --- a/lang/java/src/com/sleepycat/util/FastInputStream.java +++ b/lang/java/src/com/sleepycat/util/FastInputStream.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/FastOutputStream.java b/lang/java/src/com/sleepycat/util/FastOutputStream.java index 4983c41c..e922e547 100644 --- a/lang/java/src/com/sleepycat/util/FastOutputStream.java +++ b/lang/java/src/com/sleepycat/util/FastOutputStream.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java b/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java index 8a1502d1..20b97c7a 100644 --- a/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/PackedInteger.java b/lang/java/src/com/sleepycat/util/PackedInteger.java index 1614b664..baff10f2 100644 --- a/lang/java/src/com/sleepycat/util/PackedInteger.java +++ b/lang/java/src/com/sleepycat/util/PackedInteger.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -602,15 +602,15 @@ public class PackedInteger { /* * valueLen is the length of the value part stored in buf. Because - * the first byte of buf is used to stored the length, so we need - * to minus one. + * the first byte of buf is used to stored the length, we need + * to subtract one. */ int valueLen = offset - byte1Off - 1; /* * The first byte stores the number of additional bytes. Here we * store the result of 0x08 - valueLen, rather than directly store - * valueLen. The reason is to implement nature sort order for + * valueLen. The reason is to implement natural sort order for * byte-by-byte comparison. */ buf[byte1Off] = (byte) (0x08 - valueLen); @@ -618,7 +618,7 @@ public class PackedInteger { /* * If the value > 120, then first adjust the value by subtracting - * 119. Then the adjusted value is stored as an unsigned big endian + * 121. Then the adjusted value is stored as an unsigned big endian * integer. */ value -= 121; @@ -647,15 +647,15 @@ public class PackedInteger { /* * valueLen is the length of the value part stored in buf. Because - * the first byte of buf is used to stored the length, so we need - * to minus one. + * the first byte of buf is used to stored the length, we need to + * subtract one. */ int valueLen = offset - byte1Off - 1; /* * The first byte stores the number of additional bytes. Here we * store the result of 0xF7 + valueLen, rather than directly store - * valueLen. The reason is to implement nature sort order for + * valueLen. The reason is to implement natural sort order for * byte-by-byte comparison. */ buf[byte1Off] = (byte) (0xF7 + valueLen); @@ -663,7 +663,7 @@ public class PackedInteger { /* * If -119 <= value <= 120, only one byte is needed to store the - * value. The stored value is the original value adds 127. + * value. The stored value is the original value plus 127. */ buf[byte1Off] = (byte) (value + 127); } diff --git a/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java b/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java index 27078728..9b18bab1 100644 --- a/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/UtfOps.java b/lang/java/src/com/sleepycat/util/UtfOps.java index 033f8904..6c50aec2 100644 --- a/lang/java/src/com/sleepycat/util/UtfOps.java +++ b/lang/java/src/com/sleepycat/util/UtfOps.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java b/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java index e2f368ad..8e835873 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java +++ b/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java b/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java index 767dcfdb..22711011 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java +++ b/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java b/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java index facc46ba..981d3bbc 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java +++ b/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ |