Skip to content
Browse files

Check that service-test etc exists.

  • Loading branch information...
1 parent 660008f commit 498a1c99d553cdbb387d8ebd6ea349df8581706a @sritchie sritchie committed Oct 3, 2011
Showing with 34 additions and 24 deletions.
  1. +26 −17 elephantdb/elephantdb.iws
  2. +4 −2 src/clj/elephantdb/service.clj
  3. +4 −5 test/clj/elephantdb/service_test.clj
View
43 elephantdb/elephantdb.iws
@@ -2,12 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="44730b68-5c13-4423-862a-83d35f919bf2" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../elephantdb_elephantdb.iml" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/../src/jvm/elephantdb/client/IElephantClient.java" afterPath="$PROJECT_DIR$/../src/jvm/elephantdb/iface/IElephantClient.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../src/clj/elephantdb/service.clj" afterPath="$PROJECT_DIR$/../src/clj/elephantdb/service.clj" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../src/clj/elephantdb/shard.clj" afterPath="$PROJECT_DIR$/../src/clj/elephantdb/shard.clj" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../src/jvm/elephantdb/persistence/JavaBerkDB.java" afterPath="$PROJECT_DIR$/../src/jvm/elephantdb/persistence/JavaBerkDB.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/elephantdb.iws" afterPath="$PROJECT_DIR$/elephantdb.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../src/jvm/elephantdb/store/DomainStore.java" afterPath="$PROJECT_DIR$/../src/jvm/elephantdb/store/DomainStore.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../test/clj/elephantdb/service_test.clj" afterPath="$PROJECT_DIR$/../test/clj/elephantdb/service_test.clj" />
</list>
<ignored path="elephantdb.iws" />
<ignored path=".idea/workspace.xml" />
@@ -69,7 +66,18 @@
<file leaf-file-name="DomainStore.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../src/jvm/elephantdb/store/DomainStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="3" selection-start="1557" selection-end="1557" vertical-scroll-proportion="0.7156767">
+ <state line="119" column="6" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.54722494">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="IElephantClient.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../src/jvm/elephantdb/iface/IElephantClient.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="10" column="0" selection-start="317" selection-end="317" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -285,8 +293,9 @@
<property name="project.structure.proportion" value="0.0" />
<property name="options.splitter.main.proportions" value="0.3" />
<property name="MemberChooser.sorted" value="false" />
- <property name="options.lastSelected" value="preferences.keymap" />
+ <property name="options.lastSelected" value="preferences.sourceCode.General" />
<property name="project.structure.side.proportion" value="0.0" />
+ <property name="GoToClass.includeJavaFiles" value="false" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
@@ -519,15 +528,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../src/jvm/elephantdb/iface/IElephantClient.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="8" column="17" selection-start="258" selection-end="258" vertical-scroll-proportion="0.11684518">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../elephantdb_elephantdb.iml">
<provider selected="true" editor-type-id="text-editor">
<state line="27" column="0" selection-start="1026" selection-end="1026" vertical-scroll-proportion="0.3943525">
@@ -572,9 +572,18 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/../src/jvm/elephantdb/iface/IElephantClient.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="10" column="0" selection-start="317" selection-end="317" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/../src/jvm/elephantdb/store/DomainStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="3" selection-start="1557" selection-end="1557" vertical-scroll-proportion="0.7156767">
+ <state line="119" column="6" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.54722494">
<folding>
<element signature="imports" expanded="true" />
</folding>
View
6 src/clj/elephantdb/service.clj
@@ -43,8 +43,10 @@
its local copy, false otherwise."
[local-vs remote-vs]
(or (not (domain-has-data? local-vs))
- (< (.mostRecentVersion local-vs)
- (.mostRecentVersion remote-vs))))
+ (let [local-version (.mostRecentVersion local-vs)
+ remote-version (.mostRecentVersion remote-vs)]
+ (when (and local-version remote-version)
+ (< local-version remote-version)))))
(defn mk-local-vs
[remote-vs local-path]
View
9 test/clj/elephantdb/service_test.clj
@@ -30,8 +30,7 @@
(deftest test-basic
(with-sharded-domain [dpath
- {:num-shards 4
- :persistence-factory (JavaBerkDB.)}
+ {:num-shards 4 :persistence-factory (JavaBerkDB.)}
[[(barr 0) (barr 0 0)]
[(barr 1) (barr 1 1)]
[(barr 2) (barr 2 2)]
@@ -120,9 +119,9 @@
;; start edb and shutdown right away to get version 1 of both
;; domains
- (.shutdown
- (-> (read-global-config gtmp local-config)
- (mk-service-handler local-dir nil)))
+ (-> (read-global-config gtmp local-config)
+ (mk-service-handler local-dir nil)
+ (.shutdown))
;; create new version only for do-update domain
;;

0 comments on commit 498a1c9

Please sign in to comment.
Something went wrong with that request. Please try again.