Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-12 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1711/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
File 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java:

PS1, Line 217: );
> I don't think the comment is addressed?
I forgot. but is now addressed in a new change...


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: Yes

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-11 Thread Yingyi Bu (Code Review) 
Yingyi Bu has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 3:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1711/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
File 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java:

PS1, Line 217: );
> What does isNull() mean?  Can we have a better name for it?   This conditio
I don't think the comment is addressed?


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: Yes

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-11 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-Reviewer: abdullah alamoudi 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-11 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has submitted this change and it was merged.

Change subject: Disable search in upsert with no secondary indexes
..


Disable search in upsert with no secondary indexes

Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1711
Tested-by: Jenkins 
BAD: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: abdullah alamoudi 
---
M 
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMTreeUpsertOperatorDescriptor.java
3 files changed, 69 insertions(+), 51 deletions(-)

Approvals:
  abdullah alamoudi: Looks good to me, approved
  Jenkins: Verified; No violations found; Verified

Objections:
  Jenkins: Violations found



diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index 508f4d0..774b73e 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -1073,6 +1073,9 @@
 primaryKeyFields[i] = i;
 }
 
+boolean hasSecondaries = MetadataManager.INSTANCE
+.getDatasetIndexes(mdTxnCtx, dataset.getDataverseName(), 
dataset.getDatasetName()).size() > 1;
+
 IModificationOperationCallbackFactory modificationCallbackFactory 
= dataset.getModificationCallbackFactory(
 storaegComponentProvider, primaryIndex, jobId, 
IndexOperation.UPSERT, primaryKeyFields);
 
@@ -1127,7 +1130,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, bloomFilterKeyFields, 
fieldPermutation, idfh, null, true, indexName,
 context.getMissingWriterFactory(), 
modificationCallbackFactory, searchCallbackFactory, null,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), hasSecondaries);
 op.setType(itemType);
 op.setFilterIndex(fieldIdx);
 return new Pair<>(op, splitsAndConstraint.second);
@@ -1479,7 +1482,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, bloomFilterKeyFields, 
fieldPermutation, idfh, filterFactory, false,
 indexName, null, modificationCallbackFactory, 
searchOpCallbackFactory, prevFieldPermutation,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), true);
 } else {
 op = new LSMTreeInsertDeleteOperatorDescriptor(spec, 
recordDesc, appContext.getStorageManager(),
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
@@ -1632,7 +1635,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, null, fieldPermutation, 
indexDataflowHelperFactory, filterFactory, false,
 indexName, null, modificationCallbackFactory, 
searchCallbackFactory, prevFieldPermutation,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), true);
 } else {
 op = new LSMTreeInsertDeleteOperatorDescriptor(spec, 
recordDesc, appContext.getStorageManager(),
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
diff --git 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index ed1a247..03ef88f 100644
--- 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++ 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -89,11 +89,12 @@
 private IFrameOperationCallback

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2758/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2: BAD+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1140/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1140/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2758/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/378/ 
(6/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/561/ (2/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/300/ (4/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/3765/ (5/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5241/ (3/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/375/
 (1/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-10 Thread Steven Jacobs (Code Review) 
Steven Jacobs has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1: Code-Review+1

@Abdullah, never mind again. I talked with Ildar and your change improves write 
efficiency so much that my experiment was reaching a bottleneck elsewhere. I'm 
fine with this change.

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-08 Thread Steven Jacobs (Code Review) 
Steven Jacobs has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

> Hey Abdullah,
 > I wanted to ask about this change because it actually might help
 > with some experiments that I'm running. I'm confused about how you
 > can upsert without doing any search. Does this mean that the old
 > record will still be there but left on an older component and so
 > not read, and the new version will always be put on the newest
 > component? Does this mean that many upsets of the same keys would
 > lead to lots of unneeded data in the older components?

Just got my answers from Ildar. Excited for this change...

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-08 Thread Steven Jacobs (Code Review) 
Steven Jacobs has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Hey Abdullah,
I wanted to ask about this change because it actually might help with some 
experiments that I'm running. I'm confused about how you can upsert without 
doing any search. Does this mean that the old record will still be there but 
left on an older component and so not read, and the new version will always be 
put on the newest component? Does this mean that many upsets of the same keys 
would lead to lots of unneeded data in the older components?

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Steven Jacobs 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-06 Thread Yingyi Bu (Code Review) 
Yingyi Bu has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1711/1/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
File 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java:

PS1, Line 217: );
What does isNull() mean?  Can we have a better name for it?   This condition 
seems not covered by the commit message?


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: Yes

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-05-05 Thread Ildar Absalyamov (Code Review) 
Ildar Absalyamov has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2641/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1: BAD+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1077/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1077/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/188/ (6/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/446/ (5/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/263/
 (3/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/267/ 
(2/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2641/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Ildar Absalyamov 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5130/ (1/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: Disable search in upsert with no secondary indexes
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/3653/ (4/6)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1711
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Disable search in upsert with no secondary indexes

2017-04-28 Thread abdullah alamoudi (Code Review) 
abdullah alamoudi has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1711

Change subject: Disable search in upsert with no secondary indexes
..

Disable search in upsert with no secondary indexes

Change-Id: I4af1dc73ec909b98ce0c981c687f1b9bf13030fa
---
M 
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMTreeUpsertOperatorDescriptor.java
3 files changed, 69 insertions(+), 51 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/11/1711/1

diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index d111eb2..22ba884 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -1073,6 +1073,9 @@
 primaryKeyFields[i] = i;
 }
 
+boolean hasSecondaries = MetadataManager.INSTANCE
+.getDatasetIndexes(mdTxnCtx, dataset.getDataverseName(), 
dataset.getDatasetName()).size() > 1;
+
 IModificationOperationCallbackFactory modificationCallbackFactory 
= dataset.getModificationCallbackFactory(
 storaegComponentProvider, primaryIndex, jobId, 
IndexOperation.UPSERT, primaryKeyFields);
 
@@ -1127,7 +1130,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, bloomFilterKeyFields, 
fieldPermutation, idfh, null, true, indexName,
 context.getMissingWriterFactory(), 
modificationCallbackFactory, searchCallbackFactory, null,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), hasSecondaries);
 op.setType(itemType);
 op.setFilterIndex(fieldIdx);
 return new Pair<>(op, splitsAndConstraint.second);
@@ -1479,7 +1482,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, bloomFilterKeyFields, 
fieldPermutation, idfh, filterFactory, false,
 indexName, null, modificationCallbackFactory, 
searchOpCallbackFactory, prevFieldPermutation,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), true);
 } else {
 op = new LSMTreeInsertDeleteOperatorDescriptor(spec, 
recordDesc, appContext.getStorageManager(),
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
@@ -1632,7 +1635,7 @@
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
 comparatorFactories, null, fieldPermutation, 
indexDataflowHelperFactory, filterFactory, false,
 indexName, null, modificationCallbackFactory, 
searchCallbackFactory, prevFieldPermutation,
-metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory());
+metadataPageManagerFactory, 
dataset.getFrameOpCallbackFactory(), true);
 } else {
 op = new LSMTreeInsertDeleteOperatorDescriptor(spec, 
recordDesc, appContext.getStorageManager(),
 appContext.getIndexLifecycleManagerProvider(), 
splitsAndConstraint.first, typeTraits,
diff --git 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index ed1a247..03ef88f 100644
--- 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++ 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -89,11 +89,12 @@
 private IFrameOperationCallback frameOpCallback;
 private final IFrameOperationCallbackFactory frameOpCallbackFactory;
 private AbstractIndexModificationOperationCallback abstractModCallback;
+private final boolean hasSecondaries;
 
 public LSMPrimaryUpsertOperatorNodePushable(IIndexOperatorDescriptor 
opDesc,