From 15d9a0a325c7ce539f11b3b093ed999b4d4b3d74 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Fri, 23 Oct 2020 11:29:42 +0900 Subject: [PATCH 1/2] Update version of scalar-schema to the next version 2.2.2 --- tools/scalar-schema/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scalar-schema/project.clj b/tools/scalar-schema/project.clj index 2b9712b14e..2c48a29af5 100644 --- a/tools/scalar-schema/project.clj +++ b/tools/scalar-schema/project.clj @@ -1,4 +1,4 @@ -(defproject scalar-schema "0.1.0-SNAPSHOT" +(defproject scalar-schema "2.2.2" :description "Schema tool for Scalar DB" :url "http://github.com/scalar-labs/scalardb" :dependencies [[org.clojure/clojure "1.10.1"] From b26da0dfca739bdfb128d944b7ed93e27414f590 Mon Sep 17 00:00:00 2001 From: Yusuke Morimoto Date: Fri, 23 Oct 2020 11:31:27 +0900 Subject: [PATCH 2/2] Set uberjar name of scalar-schema --- tools/scalar-schema/README.md | 10 +++++----- tools/scalar-schema/project.clj | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/scalar-schema/README.md b/tools/scalar-schema/README.md index bef6d9b4aa..9fdbed26df 100644 --- a/tools/scalar-schema/README.md +++ b/tools/scalar-schema/README.md @@ -16,13 +16,13 @@ $ lein uberjar ### Create tables ```console # For Cosmos DB -$ java -jar target/scalar-schema.jar --cosmos -h -p -f schema.json [-r BASE_RESOURCE_UNIT] +$ java -jar target/scalar-schema-standalone-.jar --cosmos -h -p -f schema.json [-r BASE_RESOURCE_UNIT] ``` - `-r BASE_RESOURCE_UNIT` is an option. You can specify the RU of each database. The maximum RU in tables in the database will be set. If you don't specify RU of tables, the database RU will be set with this option. When you use transaction function, the RU of the coordinator table of Scalar DB is specified by this option. By default, it's 400. ```console # For Cassandra -$ java -jar target/scalar-schema.jar --cassandra -h [-P ] [-u ] [-p ] -f schema.json [-n ] [-R ] +$ java -jar target/scalar-schema-standalone-.jar --cassandra -h [-P ] [-u ] [-p ] -f schema.json [-n ] [-R ] ``` - If `-P ` is not supplied, it defaults to `9042`. @@ -33,17 +33,17 @@ $ java -jar target/scalar-schema.jar --cassandra -h [-P -p -D +$ java -jar target/scalar-schema-standalone-.jar --cosmos -h -p -D ``` ```console # For Cassandra -$ java -jar target/scalar-schema.jar --cassandra -h [-P ] [-u ] [-p ] -D +$ java -jar target/scalar-schema-standalone-.jar --cassandra -h [-P ] [-u ] [-p ] -D ``` ### Show help ```console -$ java -jar target/scalar-schema.jar --help +$ java -jar target/scalar-schema-standalone-.jar --help ``` ### Sample schema file diff --git a/tools/scalar-schema/project.clj b/tools/scalar-schema/project.clj index 2c48a29af5..068320f20b 100644 --- a/tools/scalar-schema/project.clj +++ b/tools/scalar-schema/project.clj @@ -17,5 +17,5 @@ :repl-options {:init-ns scalar-schema.cassandra-schema} :main scalar-schema.core :profiles {:uberjar {:aot :all - :uberjar-name "scalar-schema.jar" + :uberjar-name "scalar-schema-standalone-%s.jar" :jvm-opts ["-Dclojure.compiler.direct-linking=true"]}})