[#857] logical predicate chaining hbase #920

ChrizZz110 · 2018-08-01T11:24:29Z

fixes #857

…ng property table design of HBase

…ith Enclosed

* added logical operator support to hbase store * outsourced hbase filter creation to utils class

…hbase # Conflicts: # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropEquals.java # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropLargerThan.java # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropReg.java # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/utils/HBaseFilters.java # gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseGraphStoreTest.java # gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropEqualsTest.java # gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropLargerThanTest.java # gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/filter/impl/HBasePropRegTest.java

…hbase

galpha · 2018-08-02T08:36:39Z

...accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/calculate/And.java

@@ -28,7 +28,7 @@
 *
 * @param <T> element type
 */
-public final class AND<T extends EPGMElement> implements AccumuloElementFilter<T> {
+public final class And<T extends EPGMElement> implements AccumuloElementFilter<T> {


Fix JDoc "conjunctive predicate filter" to "Conjunctive predicate filter", pls fix rest of class as well

galpha · 2018-08-02T08:36:50Z

...accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/calculate/Not.java

@@ -23,19 +23,19 @@
 *
 * @param <T> input type
 */
-public final class NOT<T extends EPGMElement> implements AccumuloElementFilter<T> {
+public final class Not<T extends EPGMElement> implements AccumuloElementFilter<T> {


same as above

galpha · 2018-08-02T08:37:29Z

...-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/calculate/Or.java

@@ -28,7 +28,7 @@
 *
 * @param <T> element type
 */
-public final class OR<T extends EPGMElement> implements AccumuloElementFilter<T> {
+public final class Or<T extends EPGMElement> implements AccumuloElementFilter<T> {

  /**
   * predicate list


same as above

galpha · 2018-08-02T08:38:08Z

...umulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java

@@ -23,7 +23,7 @@
 import org.gradoop.common.model.impl.pojo.Vertex;
 import org.gradoop.storage.common.predicate.query.ElementQuery;
 import org.gradoop.storage.impl.accumulo.predicate.filter.api.AccumuloElementFilter;
-import org.gradoop.storage.impl.accumulo.predicate.filter.calculate.OR;
+import org.gradoop.storage.impl.accumulo.predicate.filter.calculate.Or;


Same as above

galpha · 2018-08-02T08:47:47Z

...tore/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/HBaseFilterUtils.java

+    @Nonnull String key,
+    @Nonnull PropertyValue value,
+    boolean negate
+  ) {


can be inline with boolean negate, same below

galpha · 2018-08-02T08:59:57Z

...p-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/calculate/And.java

+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradoop.storage.impl.hbase.filter.calculate;


keep it consistent with accumulo implementation
org.gradoop.storage.impl.hbase.predicate.filter.calculate

galpha · 2018-08-02T09:04:41Z

...p-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/calculate/Not.java

+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradoop.storage.impl.hbase.filter.calculate;


Same as above

galpha · 2018-08-02T09:11:40Z

...op-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/filter/calculate/Or.java

+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradoop.storage.impl.hbase.filter.calculate;


Same as above

galpha · 2018-08-02T09:15:33Z

...hbase/src/main/java/org/gradoop/storage/impl/hbase/io/inputformats/BaseTableInputFormat.java

@@ -49,7 +49,7 @@ void attachFilter(
    }

    if (query.getFilterPredicate() != null) {
-      conjunctFilters.addFilter(query.getFilterPredicate().toHBaseFilter());
+      conjunctFilters.addFilter(query.getFilterPredicate().toHBaseFilter(false));


Class JavaDoc.

…form with accumulo package structure + PR tasks implemented

…hbase' into #857_logical_predicate_chaining_hbase

…hbase

…hbase # Conflicts: # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/HBaseDataSource.java

galpha · 2018-08-02T14:12:51Z

LGTM

fixes dbs-leipzig#857

### Release 0.4.1 * [#877] added support for property value null (#908) fixes #877 * [#856] property pushdown hbase (#906) fixes #856 * [#864] Change examples to use csv (#905) fixes #864 * [#494] Add Set support to PropertyValue (#916) fixes #494 * [#888] Minor changes to Tuple-related functions. (#912) fixes #888 * [#779] Add code coverage for Gradoop (#914) fixes #779 * [#702] Add support for graphs without edges to TLFDataSource (#921) fixes #702 * [#909] Remove Flink dependency for store instance (#918) fixes #909 * [#876] added print for logical graph and graph collection (#913) fixes #876 * [#857] logical predicate chaining hbase (#920) fixes #857 * [#926] added argLine to maven properties (fix ide testing bug) (#929) fixes #926 * [#794] include new benchmark classes (#904) fixes #794 * [#312] example program for aggregation (#925) fixes #312 * [#901] Add SamplingConstants, AggregationConstants (#934) fixed #901 * [#935] Add tests for containment functions (#941) fixes #935 * [#900] Refactor sampling tests. (#907) fixes #900 * [#936] Generalized RollUp and DrillDown (#939) fixes #936 * [#947] Fix PageRank wrapper and add a test. (#949) fixes #947 * [#942] graph density computation for sampling evaluation (#946) fixes #942 * [#954] prepare minor release (#955) fixes #954

fixes dbs-leipzig#857

### Release 0.4.1 * [dbs-leipzig#877] added support for property value null (dbs-leipzig#908) fixes dbs-leipzig#877 * [dbs-leipzig#856] property pushdown hbase (dbs-leipzig#906) fixes dbs-leipzig#856 * [dbs-leipzig#864] Change examples to use csv (dbs-leipzig#905) fixes dbs-leipzig#864 * [dbs-leipzig#494] Add Set support to PropertyValue (dbs-leipzig#916) fixes dbs-leipzig#494 * [dbs-leipzig#888] Minor changes to Tuple-related functions. (dbs-leipzig#912) fixes dbs-leipzig#888 * [dbs-leipzig#779] Add code coverage for Gradoop (dbs-leipzig#914) fixes dbs-leipzig#779 * [dbs-leipzig#702] Add support for graphs without edges to TLFDataSource (dbs-leipzig#921) fixes dbs-leipzig#702 * [dbs-leipzig#909] Remove Flink dependency for store instance (dbs-leipzig#918) fixes dbs-leipzig#909 * [dbs-leipzig#876] added print for logical graph and graph collection (dbs-leipzig#913) fixes dbs-leipzig#876 * [dbs-leipzig#857] logical predicate chaining hbase (dbs-leipzig#920) fixes dbs-leipzig#857 * [dbs-leipzig#926] added argLine to maven properties (fix ide testing bug) (dbs-leipzig#929) fixes dbs-leipzig#926 * [dbs-leipzig#794] include new benchmark classes (dbs-leipzig#904) fixes dbs-leipzig#794 * [dbs-leipzig#312] example program for aggregation (dbs-leipzig#925) fixes dbs-leipzig#312 * [dbs-leipzig#901] Add SamplingConstants, AggregationConstants (dbs-leipzig#934) fixed dbs-leipzig#901 * [dbs-leipzig#935] Add tests for containment functions (dbs-leipzig#941) fixes dbs-leipzig#935 * [dbs-leipzig#900] Refactor sampling tests. (dbs-leipzig#907) fixes dbs-leipzig#900 * [dbs-leipzig#936] Generalized RollUp and DrillDown (dbs-leipzig#939) fixes dbs-leipzig#936 * [dbs-leipzig#947] Fix PageRank wrapper and add a test. (dbs-leipzig#949) fixes dbs-leipzig#947 * [dbs-leipzig#942] graph density computation for sampling evaluation (dbs-leipzig#946) fixes dbs-leipzig#942 * [dbs-leipzig#954] prepare minor release (dbs-leipzig#955) fixes dbs-leipzig#954

ChrizZz110 added 9 commits July 20, 2018 15:09

[dbs-leipzig#856] added PropEquals and PropLargerThan implementations

6e6c692

Merge branch 'upstream_develop' into #856_property_pushdown_hbase

a533cfb

[dbs-leipzig#856] three property filter types implemented + refactori…

de741b2

…ng property table design of HBase

[dbs-leipzig#856] refactored property value utils test class to run w…

3344ce6

…ith Enclosed

[dbs-leipzig#856] changed wrong javadoc

b2e3945

[dbs-leipzig#857] * renamed AND, OR, NOT in Accumulo store to camel case

939bf5e

* added logical operator support to hbase store * outsourced hbase filter creation to utils class

[dbs-leipzig#857] merge conflicts solved

43061a0

Merge branch 'upstream_develop' into #857_logical_predicate_chaining_…

72b74bd

…hbase

ChrizZz110 closed this Aug 1, 2018

ChrizZz110 reopened this Aug 1, 2018

ChrizZz110 closed this Aug 1, 2018

ChrizZz110 reopened this Aug 1, 2018

ChrizZz110 added 2 commits August 1, 2018 13:54

Merge branch 'develop' into #857_logical_predicate_chaining_hbase

b986a7c

Merge branch 'develop' into #857_logical_predicate_chaining_hbase

daa1396

galpha self-assigned this Aug 2, 2018

galpha requested changes Aug 2, 2018

View reviewed changes

ChrizZz110 added 5 commits August 2, 2018 14:00

[dbs-leipzig#857] moved filter package in predicate package to be con…

150b439

…form with accumulo package structure + PR tasks implemented

Merge remote-tracking branch 'origin/#857_logical_predicate_chaining_…

7916abe

…hbase' into #857_logical_predicate_chaining_hbase

Merge branch 'upstream_develop' into #857_logical_predicate_chaining_…

4266b23

…hbase

Merge branch 'upstream_develop' into #857_logical_predicate_chaining_…

810c6d2

…hbase # Conflicts: # gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/HBaseDataSource.java

[dbs-leipzig#857] merge conflicts solved

374c2e1

galpha approved these changes Aug 2, 2018

View reviewed changes

Merge branch 'develop' into #857_logical_predicate_chaining_hbase

15186c9

galpha merged commit 4e75ce4 into dbs-leipzig:develop Aug 3, 2018

Rascat pushed a commit to Rascat/gradoop that referenced this pull request Aug 7, 2018

[dbs-leipzig#857] logical predicate chaining hbase (dbs-leipzig#920)

92bc013

fixes dbs-leipzig#857

galpha pushed a commit to galpha/gradoop that referenced this pull request Oct 9, 2018

[dbs-leipzig#857] logical predicate chaining hbase (dbs-leipzig#920)

5a6eb54

fixes dbs-leipzig#857

ChrizZz110 deleted the #857_logical_predicate_chaining_hbase branch December 13, 2018 08:54

0x002A pushed a commit to ChrizZz110/gradoop that referenced this pull request Feb 19, 2019

[dbs-leipzig#857] logical predicate chaining hbase (dbs-leipzig#920)

f891287

fixes dbs-leipzig#857

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#857] logical predicate chaining hbase #920

[#857] logical predicate chaining hbase #920

ChrizZz110 commented Aug 1, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha Aug 2, 2018

galpha commented Aug 2, 2018

[#857] logical predicate chaining hbase #920

[#857] logical predicate chaining hbase #920

Conversation

ChrizZz110 commented Aug 1, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

galpha commented Aug 2, 2018