From c19fbea2ded94819f85089744160171ea009fc52 Mon Sep 17 00:00:00 2001 From: Linary Date: Tue, 5 Nov 2019 14:07:42 +0800 Subject: [PATCH] Unified license related files name (#733) Change-Id: I0f9fcc0120c33408765485a8aab7c60b876a27c0 --- .../backend/tx/GraphIndexTransaction.java | 2 +- .../static/conf/hugegraph-community.license | Bin 0 -> 720 bytes .../static/conf/hugegraph-evaluation.license | Bin 728 -> 0 bytes .../java/com/baidu/hugegraph/cmd/InitStore.java | 2 +- .../{publicCerts.store => public-certs.store} | Bin .../src/main/resources/verify-license.json | 6 +++--- .../com/baidu/hugegraph/example/Example1.java | 1 - 7 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 hugegraph-dist/src/assembly/static/conf/hugegraph-community.license delete mode 100644 hugegraph-dist/src/assembly/static/conf/hugegraph-evaluation.license rename hugegraph-dist/src/main/resources/{publicCerts.store => public-certs.store} (100%) diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java index 90777fa6b..211cbff7a 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java @@ -511,7 +511,7 @@ public class GraphIndexTransaction extends AbstractTransaction { Set ids = InsertionOrderUtil.newSet(); Iterator entries = super.query(query).iterator(); - while(entries.hasNext()) { + while (entries.hasNext()) { HugeIndex index = this.serializer.readIndex(graph(), query, entries.next()); ids.addAll(index.elementIds()); diff --git a/hugegraph-dist/src/assembly/static/conf/hugegraph-community.license b/hugegraph-dist/src/assembly/static/conf/hugegraph-community.license new file mode 100644 index 0000000000000000000000000000000000000000..547df1d6aadb6d598c0a112c12c025135fc584ff GIT binary patch literal 720 zcmV;>0x$hxhn&I!I)GmW=@&PVUmgKThh=j&eZ&eO=zTz)8_nK zm17uP1g6@~0X)m#1$9Y5;E&%Ykr75-(rMu$SDmCToliXt_;Ngi(?y4y*C6W7r6~ta z%&V04W#)rnb7`Q1*z2kb&L3u6*B@f=j#}T-wgNCs3;88yo#6NR<79gl8P<}twlTAv zTE@W&)9%idl;aCv?;y9E3G|MsN=MK;@?x9kBYj{yodBB5=Dg9=U#c5xU)Nccus}Bz zS$?C?&)z!}Z9`a^riqr`J`4eTr#|lusWC}7yN!SJXd`t>9suur&_RU54%uTtadfMQl5hz7(ei^))MH|k6%J4%A;CzbKG<-WZMAr zodj}EuxihB^SD=2I<0cQ=00#n_sEFkx6Gsz)pLarkU#*UDZ~AzTOsk3f%oP%Us(#P zDaJgJG-)8R0S}?ktE&oqrumnOmI{UOo&94;8`Bcoy%U^I~nY CvTdON literal 0 HcmV?d00001 diff --git a/hugegraph-dist/src/assembly/static/conf/hugegraph-evaluation.license b/hugegraph-dist/src/assembly/static/conf/hugegraph-evaluation.license deleted file mode 100644 index 87a4039912efddeb718ec41dc66cd505f9bd8bc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmV;}0w?`phn&I!I)GmW=@&P5TvRbTM1IxAp+$s8A z47+WW?5Pd0p94|+{Rp}u#nsWa>;#OF7J5A$Mx$NAyilL7%uANa%cFWSFiXuKNUQ4c z3NlhNYh)ro@G>X6&>gCke7MIDo5Haa z>`+hA0;HE#T;>Shato(3rIivx>~5e8exWmf0Va~0u`la^;BYa(;w{XM4^?(@E@=Wt zqUv$DYCioYIqO>W;6RT*P7)$BEjqo-L6}TViFAGyq<*5vdf~ z4Bgr+X>l)`4CIXUT4Q5$Yt*{lq=gG73^Cj!Pc{!e3rf(fChox>m11cUF&qMt_{_|` zC}!L2hd3LxUXgo^uqUHf(!f5fwm3)}VFw_|7WHR(Iqx2(jlT1E@0go~2&1581TbU4tD$BsgChkC5>>JGy_1N z(F0z6@Yx6w!$b9L{;Bo}M>E)oyLA!%TmH_m^W4v)aosYRKe(E!zwX3l}f#W$D%o57UXR$h$>aARxN KgxStn=jWn~EMe#X diff --git a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java b/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java index 100248367..4ca05898b 100644 --- a/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java +++ b/hugegraph-dist/src/main/java/com/baidu/hugegraph/cmd/InitStore.java @@ -134,6 +134,6 @@ public class InitStore { throw e; } break; - } while(retries-- > 0); + } while (retries-- > 0); } } diff --git a/hugegraph-dist/src/main/resources/publicCerts.store b/hugegraph-dist/src/main/resources/public-certs.store similarity index 100% rename from hugegraph-dist/src/main/resources/publicCerts.store rename to hugegraph-dist/src/main/resources/public-certs.store diff --git a/hugegraph-dist/src/main/resources/verify-license.json b/hugegraph-dist/src/main/resources/verify-license.json index ed2543009..9457ce9ce 100644 --- a/hugegraph-dist/src/main/resources/verify-license.json +++ b/hugegraph-dist/src/main/resources/verify-license.json @@ -1,7 +1,7 @@ { - "subject": "hugegraph-evaluation", + "subject": "hugegraph-license", "public_alias": "publiccert", "store_password": "803b6cc3-d144-47e8-948f-ec8b39c8881e", - "publickey_path": "/publicCerts.store", - "license_path": "conf/hugegraph-evaluation.license" + "publickey_path": "/public-certs.store", + "license_path": "conf/hugegraph-community.license" } diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index 560056f27..a817a7665 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -241,7 +241,6 @@ public class Example1 { try { tx.rollback(); } catch (BackendException e2) { - // TODO Auto-generated catch block e2.printStackTrace(); } } finally {