diff options
| author | Jose <jose@zeroc.com> | 2012-08-07 23:07:11 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-07 23:07:11 +0200 |
| commit | 1ff2551957f6af61808a0182da4063cd3a77bc44 (patch) | |
| tree | 16fe0ab00248a5888f47542db883e9302658114f /java/src/Freeze/Index.java | |
| parent | VS2012 build fixes (diff) | |
| parent | ICE-4755 - Freeze and DB 5.x (diff) | |
| download | ice-1ff2551957f6af61808a0182da4063cd3a77bc44.tar.bz2 ice-1ff2551957f6af61808a0182da4063cd3a77bc44.tar.xz ice-1ff2551957f6af61808a0182da4063cd3a77bc44.zip | |
Merge branch 'master' into encoding11
Diffstat (limited to 'java/src/Freeze/Index.java')
| -rw-r--r-- | java/src/Freeze/Index.java | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java index 684621985bd..adf803a9615 100644 --- a/java/src/Freeze/Index.java +++ b/java/src/Freeze/Index.java @@ -77,7 +77,15 @@ public abstract class Index implements com.sleepycat.db.SecondaryKeyCreator // the key on-disk (when it finds one). We disable this behavior: // (ref Oracle SR 5925672.992) // - key.setPartial(true); + // In DB > 5.1.x we can not set DB_DBT_PARTIAL in the key Dbt when calling + // getSearchKey. + // + if(com.sleepycat.db.Environment.getVersionMajor() < 5 || + (com.sleepycat.db.Environment.getVersionMajor() == 5 && + com.sleepycat.db.Environment.getVersionMinor() <= 1)) + { + key.setPartial(true); + } com.sleepycat.db.DatabaseEntry pkey = new com.sleepycat.db.DatabaseEntry(); com.sleepycat.db.DatabaseEntry value = new com.sleepycat.db.DatabaseEntry(); @@ -219,7 +227,15 @@ public abstract class Index implements com.sleepycat.db.SecondaryKeyCreator // the key on-disk (when it finds one). We disable this behavior: // (ref Oracle SR 5925672.992) // - key.setPartial(true); + // In DB > 5.1.x we can not set DB_DBT_PARTIAL in the key Dbt when calling + // getSearchKey. + // + if(com.sleepycat.db.Environment.getVersionMajor() < 5 || + (com.sleepycat.db.Environment.getVersionMajor() == 5 && + com.sleepycat.db.Environment.getVersionMinor() <= 1)) + { + key.setPartial(true); + } com.sleepycat.db.DatabaseEntry value = new com.sleepycat.db.DatabaseEntry(); // |