| b7a7f34 | Dan LaRocque | 16 October 2013, 17:01:05 UTC | [maven-release-plugin] prepare release 0.4.0 | 16 October 2013, 17:01:05 UTC |
| 01f18ed | Dan LaRocque | 16 October 2013, 16:57:25 UTC | Enable release-plugin autoVersionSubmodules | 16 October 2013, 16:57:25 UTC |
| 85ba572 | Dan LaRocque | 16 October 2013, 16:53:23 UTC | Tweaks to satisfy the release plugin The release:prepare goal solicits a new version for titan-dist-parent, but because it only appears through pom inheritance and not through a module relationship, it appears to do nothing with that new version, leading to an error in release:prepare's invocation of the verify phase. This hack attempts to trick release:prepare into adding titan-dist-parent as a submodule of the toplevel pom. | 16 October 2013, 16:54:58 UTC |
| 7088f8c | Dan LaRocque | 16 October 2013, 15:35:45 UTC | Copy prerelease Furnace generators into titan-test titan-test uses com.tinkerpop.furnace.generators, but Furnace has yet to be released. Only SNAPSHOT versions are available. We can't release Titan with a SNAPSHOT dependency on Furnace. As a hack, I copied the source for the generators subpackage into titan-test's source tree and changed the package name to com.tinkerpop.furnace.alpha.generators. The generators subpackage happens to be self-contained and depends on no other Furnace files. I commented the Furnace SNAPSHOT dependency in titan-test/pom.xml. This should all get reverted when Furnace releases and we can depend on it in releases. | 16 October 2013, 15:35:45 UTC |
| 538d986 | Dan LaRocque | 16 October 2013, 15:33:03 UTC | Update doc submodule pointer to latest wiki commit | 16 October 2013, 15:33:03 UTC |
| cb59afc | Matthias Broecheler | 16 October 2013, 00:22:19 UTC | date change | 16 October 2013, 00:22:19 UTC |
| 416aaaa | Dan LaRocque | 16 October 2013, 00:03:07 UTC | Kill a potential way to override CASSANDRA_INCLUDE My last commit forced hardcoded values of CASSANDRA_HOME, _CONF, and _INCLUDE when the titan-server distro's Cassandra instance was started through titan.sh, but it left open the possibility of overridding CASSANDRA_INCLUDE from the enviroment when executing titan-server's cassandra script manually. This commit hardcodes the environment in the cassandra script. | 16 October 2013, 00:03:07 UTC |
| f378689 | Dan LaRocque | 15 October 2013, 23:53:21 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 23:53:21 UTC |
| 0d9c05e | Dan LaRocque | 15 October 2013, 23:50:20 UTC | Lockdown titan-server Cassandra config This commit overrides CASSANDRA_INCLUDE, CASSANDRA_CONF, and CASSANDRA_HOME environment variables when starting cassandra from the titan-server distribution. The objective is to avoid starting a preexisting Cassandra daemon which might not have a suitable configuration for use with Rexster and Titan. | 15 October 2013, 23:50:20 UTC |
| 655ed7a | Matthias Broecheler | 15 October 2013, 22:20:06 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 22:20:06 UTC |
| 8deb860 | Dan LaRocque | 15 October 2013, 22:18:16 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 22:18:16 UTC |
| e84f9a1 | Dan LaRocque | 15 October 2013, 22:12:35 UTC | Narrow javadoc scope to titan-core This commit also eliminates mentions of titan-site from the Javadoc, replacing it instead with "Titan $version API" in the titlebar and "Titan Graph Database $version API" on the overview page. | 15 October 2013, 22:12:35 UTC |
| 83450ad | Matthias Broecheler | 15 October 2013, 21:56:34 UTC | Updated javadoc | 15 October 2013, 21:56:34 UTC |
| baebacb | Matthias Broecheler | 15 October 2013, 21:35:09 UTC | updated changelog to list hazelcast and persistit under compatibility | 15 October 2013, 21:35:09 UTC |
| 1be734e | Matthias Broecheler | 15 October 2013, 21:26:56 UTC | Changed compatible versions to only 0.4.0 | 15 October 2013, 21:26:56 UTC |
| 590368f | Dan LaRocque | 15 October 2013, 20:51:58 UTC | Define hashCode in a class with just equals RegisteredAttributeClass overrode equals(Object) but not hashCode(). I wrote a hashCode() in the standard Effective Java style to match the existing equals(Object) method definition. | 15 October 2013, 20:51:58 UTC |
| d6f8988 | Matthias Broecheler | 15 October 2013, 20:15:59 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 20:15:59 UTC |
| 2422c2d | Matthias Broecheler | 15 October 2013, 20:15:40 UTC | Fixes #429. Added large index test to verify limit updates. | 15 October 2013, 20:15:40 UTC |
| c7794ed | Dan LaRocque | 15 October 2013, 19:14:58 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 19:14:58 UTC |
| 2cfd434 | Matthias Broecheler | 15 October 2013, 19:12:55 UTC | Removed "experimental" comment for HBase | 15 October 2013, 19:12:55 UTC |
| 0bf751a | Dan LaRocque | 15 October 2013, 18:55:58 UTC | Rename titan-hazelcast.properties The graph config file formerly named titan-hazelcast.properties is now titan-hazelcastcache.properties. This change makes the filename match its storage.backend configuration key and match the toString() of the Titan graph that it creates. Fixes #430 | 15 October 2013, 18:55:58 UTC |
| 5e4ee0f | Dan LaRocque | 15 October 2013, 18:43:58 UTC | Bind test-jar creation in titan-cassandra/pom.xml The jar:test-jar goal is now bound to the package phase of the Maven lifecycle in the titan-cassandra module. This fixes a build dependency error that occurs with -Paurelius-release when the titan-cassandra tests module hasn't already been manually installed with `mvn compile jar:test-jar install` or an equivalent command. | 15 October 2013, 18:46:25 UTC |
| c91e2ae | Dan LaRocque | 15 October 2013, 16:59:58 UTC | Fix titan-dist modules in top-level pom | 15 October 2013, 16:59:58 UTC |
| 6ba37d6 | Dan LaRocque | 15 October 2013, 16:12:52 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 16:12:52 UTC |
| cb22693 | Dan LaRocque | 15 October 2013, 14:56:12 UTC | Remove redundant path element from cassandra cfgs | 15 October 2013, 14:56:12 UTC |
| 5f62c60 | Dan LaRocque | 15 October 2013, 14:55:08 UTC | Removing conflict-prone stubs from bin Fixes #422 | 15 October 2013, 14:55:08 UTC |
| 4299c58 | Dan LaRocque | 15 October 2013, 14:52:34 UTC | Adding Expect-script testing to distro assemblies When -Paurelius-release is set, Expect scripts will unzip each of the distributions (except HBase) and try running some trivial scripts interactively using the unzipped assembly's gremlin.sh and backend-appropriate Titan properties files. This is executed during the using maven-failsafe-plugin during the "verify" phase of the Maven lifecycle. | 15 October 2013, 14:52:34 UTC |
| 4548f25 | Matthias Broecheler | 15 October 2013, 03:37:05 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 15 October 2013, 03:37:05 UTC |
| 57754bf | Matthias Broecheler | 15 October 2013, 03:36:25 UTC | Added acknowledgemenets | 15 October 2013, 03:36:25 UTC |
| fcdd7ad | Matthias Broecheler | 15 October 2013, 03:29:24 UTC | Minor date update to UPGRADE | 15 October 2013, 03:29:24 UTC |
| 8c74a25 | Dan LaRocque | 14 October 2013, 21:15:37 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 14 October 2013, 21:15:37 UTC |
| 42fb86e | Dan LaRocque | 14 October 2013, 21:13:05 UTC | Splitting titan-dist logic into two poms This simplifies the child poms substantially and reduces the overall number of copy-pasted lines in the dist poms. It's a little bit hacky but it seems to work. | 14 October 2013, 21:14:53 UTC |
| de5ed8f | Dan LaRocque | 14 October 2013, 21:01:50 UTC | Make HC transactions use LOCK_EXPIRE_MS Hazelcast's notion of expiring transactions is not really identical to Titan's notion of expiring locks. Might want to introduce a new config key instead of reusing LOCK_EXPIRE_MS. This commit might fix a cause of #425. This issue seems to be timing sensitive and I've yet to reproduce it, so I can't tell for sure. | 14 October 2013, 21:01:50 UTC |
| 237965b | Matthias Broecheler | 14 October 2013, 20:54:58 UTC | Made some java-doc changes | 14 October 2013, 20:54:58 UTC |
| 69a156e | Dan LaRocque | 14 October 2013, 18:53:23 UTC | Add hazelcast.xml to titan-dist-all | 14 October 2013, 18:53:23 UTC |
| 15a27a1 | Dan LaRocque | 14 October 2013, 18:40:43 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 14 October 2013, 18:40:43 UTC |
| 1dc2bc8 | Dan LaRocque | 14 October 2013, 18:37:39 UTC | Change default Gremlin log threshold to WARN | 14 October 2013, 18:37:39 UTC |
| c46499d | Dan LaRocque | 14 October 2013, 12:12:47 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 14 October 2013, 12:12:47 UTC |
| b0d74df | Matthias Broecheler | 14 October 2013, 02:26:41 UTC | update changelog and upgrade | 14 October 2013, 02:26:41 UTC |
| c75e2bb | Matthias Broecheler | 13 October 2013, 22:43:52 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 13 October 2013, 22:43:52 UTC |
| 83bf201 | Matthias Broecheler | 13 October 2013, 20:01:33 UTC | Improved documentation | 13 October 2013, 20:01:33 UTC |
| 54bd092 | Matthias Broecheler | 13 October 2013, 20:00:25 UTC | Improved documentation | 13 October 2013, 20:00:25 UTC |
| 8826e3e | Matthias Broecheler | 13 October 2013, 19:57:19 UTC | Added multi-query to TitanGraph in addition to TitanTransaction. | 13 October 2013, 19:57:19 UTC |
| 20c849f | Dan LaRocque | 13 October 2013, 08:15:29 UTC | Restore cassandra.local with new name This is now titan-cassandra.properties. It connects using the cassandrathrift adapter to 127.0.0.1. The embeddedcassandra adapter configs have been renamed. Fixes #418 | 13 October 2013, 08:18:44 UTC |
| 5d37a96 | Dan LaRocque | 13 October 2013, 08:10:03 UTC | Add titan-hazelcast to standalone distro Fixes #419 | 13 October 2013, 08:10:03 UTC |
| 99c3c6a | Matthias Broecheler | 12 October 2013, 14:51:28 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 12 October 2013, 14:51:28 UTC |
| 78e9d0f | Matthias Broecheler | 12 October 2013, 14:51:16 UTC | add notice to readme as well | 12 October 2013, 14:51:16 UTC |
| 077e849 | Dan LaRocque | 11 October 2013, 20:35:34 UTC | Add expect-based gremlin test to 2 more distros | 11 October 2013, 20:35:34 UTC |
| e3726b1 | Dan LaRocque | 11 October 2013, 19:41:53 UTC | Made Expect test backend-agnostic What was BerkeleyIT.java in the previous commit is now SingleVertexIT.java. The specifics of the storage backend are passed from the Maven pom through a properties file to the test at runtime. | 11 October 2013, 19:41:53 UTC |
| 3404984 | Dan LaRocque | 11 October 2013, 17:08:21 UTC | A new Expect-based release archive test I'm trying this out. When running "mvn verify -Paurelius-release" in titan-dist-berkeleyje, an integration test extracts the distribution zipfile and runs an Expect script that spawns gremlin.sh and runs a few trivial commands (adds a vertex and commits it). If any of the expect subcommands timeout or don't see what they want, then the script exits with nonzero status and the integration test fails, in turn failing the verify lifecycle stage for the module. | 11 October 2013, 17:08:21 UTC |
| 234fcb1 | Dan LaRocque | 11 October 2013, 15:32:59 UTC | Rename graph in server dist to "graph" (was titan) | 11 October 2013, 15:32:59 UTC |
| 64d19ec | Dan LaRocque | 11 October 2013, 15:27:42 UTC | Renamed "quickstart" distro to "server" | 11 October 2013, 15:27:42 UTC |
| 27ba15d | Dan LaRocque | 11 October 2013, 14:15:02 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 11 October 2013, 14:15:02 UTC |
| 8bbc64b | Dan LaRocque | 11 October 2013, 11:58:04 UTC | Remove ES configs from BDB & Persistit assemblies | 11 October 2013, 11:58:04 UTC |
| df27cf1 | Dan LaRocque | 11 October 2013, 11:56:50 UTC | Fix config file path in backend.xml assembly | 11 October 2013, 11:56:50 UTC |
| 3eb7097 | Stephen Mallette | 11 October 2013, 10:06:48 UTC | Update readme to reflect workaround for building distributions without generating wiki docs. | 11 October 2013, 10:06:48 UTC |
| 0ea2e08 | Stephen Mallette | 11 October 2013, 10:03:49 UTC | Added the titan-rexster dependency to the quickstart module. | 11 October 2013, 10:03:49 UTC |
| 7a43c5a | Dan LaRocque | 11 October 2013, 03:13:12 UTC | Remove titan-all's jar-with-dependencies I played around with this when configuring the jre6 cross-compiling profile, but it's a hazard to snapshot deployment | 11 October 2013, 03:13:12 UTC |
| 0507771 | Matthias Broecheler | 10 October 2013, 18:44:43 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 10 October 2013, 18:44:43 UTC |
| 6172a48 | Dan LaRocque | 10 October 2013, 17:03:00 UTC | Add titan-rexster to top-level module set Fixes #415 Fixes #416 | 10 October 2013, 17:07:12 UTC |
| d01dd62 | Dan LaRocque | 10 October 2013, 13:10:52 UTC | Restore TitanGraphConfiguration in new module I erroneously deleted this in a649b7a3d40eae5fb7cbbe6b37988a, but it's still needed for the Rexster quickstart distro | 10 October 2013, 13:10:52 UTC |
| 752ba07 | Dan LaRocque | 10 October 2013, 11:51:01 UTC | Delete redundant titan-site dependencies in dists The titan-site dependency is declared in titan-dist; titan-dist's children inherit the dependency need not declare it again | 10 October 2013, 11:51:01 UTC |
| 8b3ce7e | Dan LaRocque | 10 October 2013, 05:13:20 UTC | Refactoring bin/gremlin.sh config file handling TitanFactory.open("path/to/titan.properties") now interprets non-absolute backend directory paths relative to the directory containing the the properties file. Before this commit, it was relative to the working directory of the JVM. | 10 October 2013, 05:22:40 UTC |
| 4a9b6da | Matthias Broecheler | 09 October 2013, 23:39:44 UTC | updated readme files for 0.4.0 release | 09 October 2013, 23:39:44 UTC |
| 313a0c8 | Dan LaRocque | 09 October 2013, 23:30:28 UTC | Make Persistit data dir relative: /tmp/graph -> db Fixes #413 | 09 October 2013, 23:30:28 UTC |
| 622cd6d | Matthias Broecheler | 09 October 2013, 23:19:45 UTC | Fixes #388 and undoes previous commit where the wrong option was configured. | 09 October 2013, 23:19:45 UTC |
| 855592f | Matthias Broecheler | 09 October 2013, 21:35:30 UTC | Updated License name to full Apache 2 | 09 October 2013, 21:35:30 UTC |
| f163615 | Matthias Broecheler | 09 October 2013, 21:14:10 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 09 October 2013, 21:14:10 UTC |
| 9785baf | Matthias Broecheler | 09 October 2013, 21:11:31 UTC | Making sniffing configurable in ES. Fixes #388. | 09 October 2013, 21:11:31 UTC |
| 3ce428e | Marko A. Rodriguez | 09 October 2013, 15:59:03 UTC | updated ScriptExecutor to use args[0...blah] so its consistent with Gremlin 2.2.0+ distribution. | 09 October 2013, 15:59:03 UTC |
| 3ffc4a6 | Matthias Broecheler | 09 October 2013, 14:35:46 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 09 October 2013, 14:35:46 UTC |
| a2d5633 | Matthias Broecheler | 09 October 2013, 14:04:08 UTC | Accidentally committed rubbish. | 09 October 2013, 14:04:08 UTC |
| 6cbabb1 | Matthias Broecheler | 09 October 2013, 13:53:04 UTC | renaming primaryKey to sortKey | 09 October 2013, 13:53:04 UTC |
| 0d9da66 | Dan LaRocque | 09 October 2013, 04:54:09 UTC | Deleting old config files | 09 October 2013, 04:54:09 UTC |
| 78097c7 | Dan LaRocque | 09 October 2013, 04:19:44 UTC | Configuration file cleanup and path fixes | 09 October 2013, 04:52:48 UTC |
| 2708127 | Dan LaRocque | 09 October 2013, 02:21:53 UTC | Rename Cassandra memory stress test Also removed the @Category({PerformanceTests.class}) annotation from the Cassandra subclass of the memory stress test. The base class already carries @Category({MemoryTests.class}), so adding @Cat(PT) in the subclass is unnecessary. | 09 October 2013, 02:38:55 UTC |
| 88d4270 | Dan LaRocque | 09 October 2013, 02:21:38 UTC | Fix cassandra configs for perf testing | 09 October 2013, 02:21:38 UTC |
| a23748f | Dan LaRocque | 09 October 2013, 01:25:44 UTC | Include hazelcast.xml in HC distro archives | 09 October 2013, 01:25:44 UTC |
| ad6c72e | Dan LaRocque | 09 October 2013, 01:04:52 UTC | Change hazelcast config from kcvs to cache | 09 October 2013, 01:04:52 UTC |
| 5f4e8be | Matthias Broecheler | 08 October 2013, 23:38:53 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 08 October 2013, 23:38:53 UTC |
| b6c4402 | Matthias Broecheler | 08 October 2013, 23:38:39 UTC | Extended performance test coverage for benchmarking read heavy transactions (i.e. traversals only). | 08 October 2013, 23:38:39 UTC |
| 0db4efc | Dan LaRocque | 08 October 2013, 23:21:17 UTC | Make mvn -Pperformance-test run MemoryTests | 08 October 2013, 23:21:17 UTC |
| 2a603e9 | Dan LaRocque | 08 October 2013, 22:21:47 UTC | Add hard titan-hbase log4j and slf4j-log4j12 deps The HBase client depends on both log4j and its slf4j binding. Unlike the rest of Titan's modules, we can't make these artifacts optional in titan-hbase. This commit makes them mandatory and compile-scoped in titan-hbase alone. HBase references: * https://issues.apache.org/jira/browse/HBASE-2608 * http://hbase.apache.org/book/config.files.html#client_dependencies | 08 October 2013, 22:21:47 UTC |
| f9762b8 | Dan LaRocque | 08 October 2013, 13:52:03 UTC | Merge branch 'master' of github.com:thinkaurelius/titan | 08 October 2013, 13:52:03 UTC |
| 1edbda6 | Dan LaRocque | 08 October 2013, 05:23:22 UTC | Make titan-all build a jar-with-dependencies | 08 October 2013, 05:23:22 UTC |
| adcd1fa | Dan LaRocque | 08 October 2013, 04:00:28 UTC | Adding Hazelcast assembly This commit also moves BDB files created by gremlin.sh from /tmp to the much more cumbersome path titan-dist/titan-dist-all/target/titan-all-standalone/db; this could be avoided with a little more complication of the assembly config | 08 October 2013, 04:40:54 UTC |
| 12a3cdd | Dan LaRocque | 08 October 2013, 02:51:26 UTC | Change JDK6/7 compile profile activation criteria | 08 October 2013, 03:08:26 UTC |
| c9895f0 | Dan LaRocque | 08 October 2013, 02:38:50 UTC | Attempting JDK6 config simplification Combining the "standard" and "jre6" pom.xml profiles into a single dependency tag inside the root tag, where possible. | 08 October 2013, 02:38:50 UTC |
| 860adf3 | Dan LaRocque | 08 October 2013, 02:37:55 UTC | Adding log4j.properties for gremlin.sh Tested with bin/gremlin.sh from repository root; should also apply to distribution assemblies, but haven't tested yet | 08 October 2013, 02:37:55 UTC |
| 3af8545 | Matthias Broecheler | 08 October 2013, 01:58:07 UTC | Updated documentation | 08 October 2013, 01:58:07 UTC |
| f5c6d7b | Matthias Broecheler | 08 October 2013, 01:18:43 UTC | Fixed variable type declaration issue in groovy test | 08 October 2013, 01:18:43 UTC |
| 3141220 | Dan LaRocque | 08 October 2013, 01:16:27 UTC | Refactor poms to allow JDK cross-compiling The current Titan source can't build on JDK 6 (tested Oracle 6u45) because TitanVertexQuery inherits two unrelated return types for the method limit(int); this is supported in 7 but not 6. Here's the exact wording of the compiler error on Oracle 6u45: [ERROR] /home/dalaro/tinkerelius/titan/titan-core/src/main/java/com/thinkaurelius/titan/core/TitanVertexQuery.java:[16,7] types com.tinkerpop.blueprints.VertexQuery and com.thinkaurelius.titan.core.BaseVertexQuery are incompatible; both define limit(int), but with unrelated return types Related bug: http://bugs.sun.com/view_bug.do?bug_id=6908259 However, we can still compile Titan using JDK 7 with -source 1.6 -target 1.6 and -Xbootclasspath:/path/to/jdk/rt.jar. This does not throw the error above. This commit records the first complete set of project poms that can build for both jars and assemblies -target 1.6 and -target 1.7. It's still rough and could use some cleanup. In particular, the "jre6" and "standard" profiles that I introduced in this commit are unnecessary whenever the set of dependencies in each case is identical, differing only in the dependency classifiers on titan artifacts. I didn't realize that at the start, so this commit includes a combination of approaches for managing dependencies under the two compilation targets. Also, the names "jre6" and "standard" for compilation targeting profiles are bad. | 08 October 2013, 01:16:27 UTC |
| 2b070fc | Matthias Broecheler | 08 October 2013, 01:10:08 UTC | Refactored TypeMaker to use new terminology and split PropertyKey and EdgeLabel maker into separate builder classes. | 08 October 2013, 01:10:08 UTC |
| eaf0990 | Dan LaRocque | 07 October 2013, 18:15:19 UTC | Removing redundant <finalName> pom.xml tags The removed tag in each pom was <finalName>${project.artifactId}-${project.version}</finalName>, which is the default. I'm removing these redundant tags from Titan's submodules to make overridding <finalName> for JDK6 a little bit easier. | 07 October 2013, 18:15:19 UTC |
| 81f40a0 | Matthias Broecheler | 07 October 2013, 16:27:26 UTC | Merge branch 'indexing4' | 07 October 2013, 16:27:26 UTC |
| 42adf83 | Dan LaRocque | 06 October 2013, 14:28:06 UTC | Column slice hack for CacheStoreAdapter#getKeys This commit adds code to check whether keys returned by the unordered getKeys(SliceQuery, StoreTransaction) method actually contain columns matching the slice. It's a hack and not particularly efficient. | 06 October 2013, 14:28:06 UTC |
| 60e5cc7 | Dan LaRocque | 06 October 2013, 13:33:25 UTC | Hacking HazelcastKCVS to check column slices Why did getSlice explicitly use a signed bytes comparator when testing columns against the lower and upper slice bounds? It's clear that this was deliberate, but I can't see the reasoning behind it. It makes a current getSlice test fail. I changed that to unsigned and also implemented a naive column bounds check in getKeys. This getKeys hack could be smarter about the caching columns it reads during slice checking for potential later reuse by getEntries, but I'm sticking with the simple-and-dumb version initially. | 06 October 2013, 13:37:27 UTC |
| 1e1de97 | Dan LaRocque | 06 October 2013, 05:04:35 UTC | Heavily-conflicted inmemory->master merge attempt This had both conflicted diff hunks, as noted in the automatically-generated list below, and diff hunks that applied perfectly but caused compile errors. Although all tests except those in Hazelcast pass (more on that later), this was a substantial merge and I could easily have made a mistake somewhere. Some points of contention: * inmemory removed the KVS getKeys(tx) * master replaced beginTransaction(ConsistencyLevel) with beginTransaction(StoreTxConfig) * inmemory modified KCVSTest to hold only one transaction open at any given time, whereas master did not have this refactoring but did have a few new test method additions; also, inmemory renamed the testStore public static final variable used by name in many subclasses * master refactored KeyIterator to implement Iterator<StaticBuffer>, while inmemory rewrote several KeyIterator implementations to account for the first bullet in this list (I think) * inmemory removed ensureClosed() checks inside KeyIterator hasNext() and next() implementations for reasons I don't understand * minor StoreFeatures refactoring differences between master and inmemory, but I think those are trivial There may be other stuff I missed. Hazelcast is disabled because one of the new getKeys-exercising methods in KCVSTest seemed to expose a bug in the implementation -- it looks like it might not honor column slice values for certain invocations of getKeys. I'm commenting the module in the top-level pom until I investigate the failure. Conflicts: titan-berkeleyje/src/main/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyJEKeyValueStore.java titan-berkeleyje/src/test/java/com/thinkaurelius/titan/diskstorage/berkeleyje/BerkeleyJeHashKeyColumnValueTest.java titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/astyanax/AstyanaxOrderedKeyColumnValueStore.java titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/embedded/CassandraEmbeddedKeyColumnValueStore.java titan-cassandra/src/main/java/com/thinkaurelius/titan/diskstorage/cassandra/thrift/CassandraThriftKeyColumnValueStore.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/Backend.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/BackendTransaction.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/CachedKeyColumnValueStore.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/KCVSUtil.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/KeyColumnValueStore.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/KeyRangeQuery.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/inmemory/InMemoryKeyColumnValueStore.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/keyvalue/OrderedKeyValueStoreAdapter.java titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/locking/consistentkey/ExpectedValueCheckingStore.java titan-core/src/main/java/com/thinkaurelius/titan/graphdb/database/StandardTitanGraph.java titan-hbase/src/main/java/com/thinkaurelius/titan/diskstorage/hbase/HBaseKeyColumnValueStore.java titan-persistit/src/main/java/com/thinkaurelius/titan/diskstorage/persistit/PersistitKeyValueStore.java titan-persistit/src/main/java/com/thinkaurelius/titan/diskstorage/persistit/PersistitStoreManager.java titan-persistit/src/test/java/com/thinkaurelius/titan/diskstorage/persistit/PersistitHashKeyColumnValueTest.java titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/HashKeyColumnValueStoreTest.java titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/KeyColumnValueStoreTest.java titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/KeyValueStoreTest.java titan-test/src/main/java/com/thinkaurelius/titan/diskstorage/LockKeyColumnValueStoreTest.java | 06 October 2013, 05:04:35 UTC |
| 2c41834 | Dan LaRocque | 05 October 2013, 23:00:27 UTC | Rename KCVUtil to KCVSUtil This naming differential crept in sometime after master and the inmemory branch diverged and caused a bunch of trivial conflicts. I'm renaming it to agree with master to make the merge easier. | 05 October 2013, 23:01:52 UTC |
| 26804bc | Dan LaRocque | 05 October 2013, 22:44:51 UTC | Cassandra test configuration tweaks * Disabled auto_snapshot in the cassandra.yaml used by surefire * Reduced -Xmx768m to -Xmx512m in surefire's fork | 05 October 2013, 22:44:51 UTC |
