From 8b0b8f22ef9c81af8aec6e6079b56a5c7d2178e0 Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 25 Mar 2019 16:37:31 +0800 Subject: [PATCH 1/7] Create readme.txt --- readme.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 readme.txt diff --git a/readme.txt b/readme.txt new file mode 100644 index 00000000000..10613fed487 --- /dev/null +++ b/readme.txt @@ -0,0 +1,5 @@ +mvn package -DskipTests +mvn package -e + +geowave官方源码打包命令 +mvn package -P hbase-container-singlejar -DskipTests From e2d16051ac10778a69df15d9b24ee8ef375396ef Mon Sep 17 00:00:00 2001 From: hsg77 Date: Thu, 28 Mar 2019 10:49:13 +0800 Subject: [PATCH 2/7] Update readme.txt --- readme.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/readme.txt b/readme.txt index 10613fed487..01200c61243 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,13 @@ mvn package -DskipTests mvn package -e +关于google.protobuf定义的位置 + +定义的protobuf的文件的位置 +geowave-parent/extensions/datastores/hbase/src/main/protobuf +自动生成的java类的位置 +(Maven Projects面板中GeoWave Hbase/Lifecycle/clean,compile,package可生成对应的java类) +geowave-parent/extensions/datastores/hbase/src/main/java/org.locationtech.geowave.datastore.hbase/coprocessors/protobuf/*.java + geowave官方源码打包命令 mvn package -P hbase-container-singlejar -DskipTests From a71335afde377ab2fa090c42a5942f9d58e3ed6c Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 29 Apr 2019 17:59:46 +0800 Subject: [PATCH 3/7] Update readme.txt --- readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readme.txt b/readme.txt index 01200c61243..1e495024516 100644 --- a/readme.txt +++ b/readme.txt @@ -11,3 +11,9 @@ geowave-parent/extensions/datastores/hbase/src/main/java/org.locationtech.geowav geowave官方源码打包命令 mvn package -P hbase-container-singlejar -DskipTests + +geoserver 数据源插件的代码位置 +org.locationtech.geowave.adapter.vector.plugin.GeoWaveGTDataStoreFactory +extensions/adapters/vector/src/main/resources/META-INFO.services +extensions/adapters/vector/src/main/java/org/locationtech.geowave.adapter.vector/plugin/GeoWaveGTDataStoreFactory + From 0c6da33b0ec5d5b446f33619b519d5896ca47485 Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 6 May 2019 09:43:08 +0800 Subject: [PATCH 4/7] modify TieredSpationJoin createReprojectMap return result Not comprehensive --- .../spark/spatial/TieredSpatialJoin.java | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java b/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java index 24b5c9e0ea1..d166a0f025c 100644 --- a/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java +++ b/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java @@ -380,29 +380,27 @@ private Map> createReprojectMap( final Byte[] buildSide, final Byte[] testSide, final HashSet sharedTiers) { - final Map> resultMap = Maps.newHashMap(); - final int testLastIndex = testSide.length; - for (final Byte tierLeft : buildSide) { - final int firstGreater = Arrays.binarySearch(testSide, tierLeft); - - if (firstGreater >= 0) { - // Found in array - sharedTiers.add(tierLeft); - } - - final int insertionPoint = Math.abs(firstGreater); - if (insertionPoint >= testLastIndex) { - // Not present in array, and none greater than this value - continue; + final Map> resultMap = Maps.newHashMap(); + final int testLastIndex = testSide.length; + for (final Byte tierLeft : buildSide) { + final int firstGreater = Arrays.binarySearch(testSide, tierLeft); + //add same tier id + if (firstGreater >= 0) { + // Found in array + sharedTiers.add(tierLeft); + } + //add highter tier id + HashSet higherTiers = Sets.newHashSet(); + for(Byte testID :testSide) + { + if(tierLeft higherTiers = - Sets.newHashSet(Arrays.copyOfRange(testSide, insertionPoint, testLastIndex)); - resultMap.put(tierLeft, higherTiers); - } - return resultMap; + return resultMap; } private void setBufferAmount(final double bufferAmount) { From 5656b3fbe6c588c128e96b185d33c90b9c22a839 Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 6 May 2019 09:43:53 +0800 Subject: [PATCH 5/7] test --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index 1e495024516..86e9b77ebba 100644 --- a/readme.txt +++ b/readme.txt @@ -17,3 +17,5 @@ org.locationtech.geowave.adapter.vector.plugin.GeoWaveGTDataStoreFactory extensions/adapters/vector/src/main/resources/META-INFO.services extensions/adapters/vector/src/main/java/org/locationtech.geowave.adapter.vector/plugin/GeoWaveGTDataStoreFactory +1 + From 48f8828bc46c603fff02479276dd9cba16c96ec1 Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 6 May 2019 09:56:02 +0800 Subject: [PATCH 6/7] modify TieredSpatialJoin.java code style --- .../geowave/analytic/spark/spatial/TieredSpatialJoin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java b/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java index d166a0f025c..50ef501b44b 100644 --- a/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java +++ b/analytics/spark/src/main/java/org/locationtech/geowave/analytic/spark/spatial/TieredSpatialJoin.java @@ -379,10 +379,12 @@ public void join( private Map> createReprojectMap( final Byte[] buildSide, final Byte[] testSide, - final HashSet sharedTiers) { + final HashSet sharedTiers) + { final Map> resultMap = Maps.newHashMap(); final int testLastIndex = testSide.length; - for (final Byte tierLeft : buildSide) { + for (final Byte tierLeft : buildSide) + { final int firstGreater = Arrays.binarySearch(testSide, tierLeft); //add same tier id if (firstGreater >= 0) { @@ -393,7 +395,7 @@ private Map> createReprojectMap( HashSet higherTiers = Sets.newHashSet(); for(Byte testID :testSide) { - if(tierLefttierLeft) { higherTiers.add(testID); } From 0b1bd3c97a88ad7154fdc57ed9bc31e49b12bfa1 Mon Sep 17 00:00:00 2001 From: hsg77 Date: Mon, 6 May 2019 10:15:13 +0800 Subject: [PATCH 7/7] remove readme.txt --- readme.txt | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 readme.txt diff --git a/readme.txt b/readme.txt deleted file mode 100644 index 86e9b77ebba..00000000000 --- a/readme.txt +++ /dev/null @@ -1,21 +0,0 @@ -mvn package -DskipTests -mvn package -e - -关于google.protobuf定义的位置 - -定义的protobuf的文件的位置 -geowave-parent/extensions/datastores/hbase/src/main/protobuf -自动生成的java类的位置 -(Maven Projects面板中GeoWave Hbase/Lifecycle/clean,compile,package可生成对应的java类) -geowave-parent/extensions/datastores/hbase/src/main/java/org.locationtech.geowave.datastore.hbase/coprocessors/protobuf/*.java - -geowave官方源码打包命令 -mvn package -P hbase-container-singlejar -DskipTests - -geoserver 数据源插件的代码位置 -org.locationtech.geowave.adapter.vector.plugin.GeoWaveGTDataStoreFactory -extensions/adapters/vector/src/main/resources/META-INFO.services -extensions/adapters/vector/src/main/java/org/locationtech.geowave.adapter.vector/plugin/GeoWaveGTDataStoreFactory - -1 -