[15721] Sequence second PR #1345

bdengNE · 2018-05-05T03:54:58Z

In the second PR, we have fixed the problems found in first PR and modified codes based on the updates in the master branch. In addition, we are currently adding features such as drop sequence and currency control, etc (still implementing them and you will see more commits to the PR very soon)

…r.cpp

…functioning well

# Conflicts: # src/function/old_engine_string_functions.cpp

lym953 · 2018-05-11T02:52:53Z

src/catalog/catalog_cache.cpp

+}
+
+/*@brief   evict sequence catalog object from cache
+ * @param   sequence_name, database_oid


Each parameter should be put on a separate line.

lym953 · 2018-05-11T02:53:34Z

src/catalog/catalog_cache.cpp

+}
+
+/*@brief   get sequence catalog object from cache
+ * @param  sequence_name, database_oid


Each parameter should be put on a separate line.

lym953 · 2018-05-11T02:54:50Z

src/catalog/catalog_cache.cpp

+}
+
+/*@brief  get the hash key given the sequence information
+ * @param  sequence_name, database_oid


Each parameter should be put on a separate line.

lym953 · 2018-05-11T03:03:03Z

src/catalog/sequence_catalog.cpp

+}
+
+/* @brief   Delete the sequence by name.
+ * @param   database_oid  the databse_oid associated with the sequence


Wrong parameter in doc

lym953 · 2018-05-11T03:08:37Z

src/catalog/sequence_catalog.cpp

+  // the result is a vector of executor::LogicalTile
+  auto result_tiles =
+      GetResultWithIndexScan(column_ids, index_offset, values, txn);
+  // carefull! the result tile could be null!


Typo: carefull

lym953 · 2018-05-11T03:20:45Z

src/function/sequence_functions.cpp

+ * @return  the result of executing CurrVal
+ */
+type::Value SequenceFunctions::_Currval(const std::vector<type::Value> &args) {
+  executor::ExecutorContext* ctx=(executor::ExecutorContext*)args[1].GetAs<uint64_t>();


Not formatted

lym953 · 2018-05-11T03:21:07Z

src/function/sequence_functions.cpp

+}
+
+/*@brief   The wrapper function to get the current value for the specified sequence
+ * @param   sequence name, executor context


lym953 · 2018-05-11T03:30:17Z

src/include/catalog/sequence_catalog.h

+    if (seq_min > seq_max) {
+        throw SequenceException(
+            StringUtil::Format(
+              "MINVALUE (%d) must be less than MAXVALUE (%d)", seq_min, seq_max));


less than -> less than or equal to
or: cannot be greater than

lym953 · 2018-05-11T03:32:26Z

src/include/executor/plan_executor.h

      std::function<void(executor::ExecutionResult,
-                         std::vector<ResultValue> &&)> on_complete);
+                         std::vector<ResultValue> &&)> on_complete,
+      std::string default_database_name="");


Not formatted

lym953 · 2018-05-11T03:36:08Z

src/include/parser/parsenodes.h


+typedef struct CreateSeqStmt
+{
+	NodeTag		type;


Not formatted

yjc408 · 2018-05-11T17:06:12Z

src/catalog/catalog_cache.cpp

+
+  // check if already in cache
+  if (sequence_objects_cache.find(hash_key) !=
+          sequence_objects_cache.end()) {


Do you want to throw an exception for this case?

yjc408 · 2018-05-11T17:07:26Z

src/catalog/sequence_catalog.cpp

+  int64_t result = seq_curr_val;
+  seq_prev_val = result;
+  if (seq_increment > 0) {
+    if ((seq_max >= 0 && seq_curr_val > seq_max - seq_increment) ||


Could you add some comments to explain the logic?

yjc408 · 2018-05-11T17:08:17Z

src/catalog/sequence_catalog.cpp

+  std::unique_ptr<storage::Tuple> tuple(
+      new storage::Tuple(catalog_table_->GetSchema(), true));
+
+  auto val0 = type::ValueFactory::GetIntegerValue(GetNextOid());


More meaningful variable names here

yjc408 · 2018-05-11T17:09:43Z

src/catalog/sequence_catalog.cpp

+  return new_sequence;
+}
+
+bool SequenceCatalog::UpdateNextVal(oid_t sequence_oid, int64_t nextval,


Missing doc here

yjc408 · 2018-05-11T17:12:28Z

src/catalog/sequence_catalog.cpp

+  LOG_INFO("sequence %d will be deleted!", sequence_oid);
+
+  oid_t database_oid = database_object->GetDatabaseOid();
+  DeleteSequenceByName(sequence_name, database_oid, txn);


Do you want to get the return value of this function and return fail sometimes?

yjc408 · 2018-05-11T17:17:10Z

src/executor/executor_context.cpp

  return pool_.get();
 }

+std::string ExecutorContext::GetDatabaseName() const {


usually this function is set in header file.

This is what other functions in the same file do, so gonna keep it like this.

yjc408 · 2018-05-11T17:18:29Z

src/function/sequence_functions.cpp

+      ret = txn_manager.CommitTransaction(mini_txn);
+    }
+    return val;
+  } else {


Don't need this else

We do, for the case when no such sequence exists at all.

yjc408 · 2018-05-11T17:20:35Z

src/include/executor/executor_context.h


  type::EphemeralPool *GetPool();

+  std::string GetDatabaseName() const;


Like previous comment, you can make this function inline to return the database name (like what other files do)

This is what other functions in the same file do, so gonna keep it like this.

yjc408 · 2018-05-11T17:28:58Z

src/include/common/internal_types.h

  CONSTRAINT = 4,             // constraint create type
  TRIGGER = 5,                // trigger create type
  SCHEMA = 6,                 // schema create type
+  SEQUENCE = 7                // sequencce create type


typo in comment

yjc408 · 2018-05-11T17:30:21Z

src/catalog/sequence_catalog.cpp

+
+/* @brief   get sequence oid from pg_sequence table given sequence_name and
+ * database_oid
+ * @param   database_oid  the databse_oid associated with the sequence


wrong param order

yangjuns · 2018-05-11T19:38:35Z

src/catalog/catalog_cache.cpp

+bool CatalogCache::InsertSequenceObject(
+    std::shared_ptr<SequenceCatalogObject> sequence_object) {
+  if (!sequence_object || sequence_object->seq_oid == INVALID_OID) {
+    return false;  // invalid object


In this case, false doesn't indicate the sequence exists in the cache. Probably need to change the @return spec or requires the sequence_object to be valid.

yangjuns · 2018-05-11T19:42:59Z

src/catalog/catalog_cache.cpp

+  std::size_t hash_key = GetHashKey(sequence_name, database_oid);
+  auto it = sequence_objects_cache.find(hash_key);
+  if (it == sequence_objects_cache.end()) {
+    return nullptr;


It said it return object with invalid oid if not found. To make things consistent, instead of returning nullptr, we should probably return an SequenceCatalogObject with seq_oid = INVALID_OID. Or another easier way is to change the spec.

This is a consistent behavior with the existing methods (like GetTableObejct, etc.) in catalog_cache.cpp so I would like to keep it.

yangjuns · 2018-05-11T19:45:09Z

src/catalog/catalog_cache.cpp

+ * @param  sequence_name, database_oid
+ * @return  hash key
+ */
+std::size_t CatalogCache::GetHashKey(const std::string sequence_name,


Not sure but wouldn't using reference, const std::string &, avoid unnecessary copies of strings?

yangjuns · 2018-05-11T19:49:04Z

src/catalog/sequence_catalog.cpp

+
+  LOG_INFO("sequence %d will be deleted!", sequence_oid);
+
+  oid_t database_oid = database_object->GetDatabaseOid();


Seems like you called GetDataBaseOid() three times. You could instead store it.

yangjuns · 2018-05-11T19:50:05Z

src/catalog/sequence_catalog.cpp

+    concurrency::TransactionContext *txn) {
+  oid_t index_offset = IndexId::DBOID_SEQNAME_KEY;
+  std::vector<type::Value> values;
+  values.push_back(type::ValueFactory::GetIntegerValue(database_oid).Copy());


Why do we need Copy() here?

Just following conventions from other files.

yangjuns · 2018-05-11T20:00:09Z

src/expression/function_expression.cpp

    child_values.push_back(child->Evaluate(tuple1, tuple2, context));
  }
+  if (func_name_ == "nextval" || func_name_ == "currval") {
+    uint64_t ctx = (uint64_t)context;


Casting a pointer to a 64bit integer and passing as an BigIntValue doesn't look like a good design for me.

yangjuns · 2018-05-11T20:08:00Z

src/function/sequence_functions.cpp

+                  ->GetSystemCatalogs(database_oid)
+                  ->GetSequenceCatalog()
+                  ->GetSequence(database_oid, sequence_name, mini_txn);
+  if (sequence_object != nullptr) {


The function EvictSequenceObject() grantees to evict the given database_oid. So I think you don't need to search for sequence_object and double check again. Or, since EvictSequenceObject() will return false and true, you can use this information for help you make decision.

The sequence may exist in the catalog but not exist in the cache. In this case, EvictSequenceObject() will return false but we want to call nextval on the sequence.

…g the temp table components...

…cmu-db#1345

apavlo · 2018-06-11T21:30:19Z

I am closing this PR. I will merge the sequence code manually without the temporary table patches.

…cmu-db#1345 Checking in the testing files from cmu-db#1345 These should be the last files that we need from from cmu-db#1345 This compiles and passes all the tests except for the sequence test (obviously)

Kangyan-Zhou and others added 30 commits March 22, 2018 16:07

finish part of parser; need to add handler function in create_executo…

30d48ac

…r.cpp

finish part of parser; need to add handler function in create_executo…

086b493

…r.cpp

Merge branch 'master' of https://github.com/HenryZhou0333/peloton

59b85f6

Merge remote-tracking branch 'upstream/master'

282afb3

add postgresql parser test for sequences

28b702e

remove AS in sequencce

ddb3dd7

add exception for redefined parser

26230e3

finish compiling create sequence

b273056

Merge remote-tracking branch 'upstream/master'

d90a649

having issue with GetSequence()

c1a4e1d

add new GetSequence impl; fix BasicTest in sequence

f8ec42a

add tests for sequence

0d3521c

fix merge conflict

8fe7d6c

one step before submitting pr

87680be

change way of update pg_sequence table in nextval

7d7955c

style fix

503c89f

rename sequence test

7762354

Merge remote-tracking branch 'upstream/master'

b340c86

remove unnecessary file

6897566

adding nextval & currval functions; comment out lock and nextval not …

b8c7317

…functioning well

update pg_sequence after calling nextval; have seg fault in txn;

d665c94

temporary add code from other team

e71a21c

fix conflict with master

ca8f8fe

again fix conflicts

85af574

move sequence catalog into system catalogs

7997a9a

fix issues in comments; add sanity check for sequence arguments

35d6a5a

move sequence functions from string files to new files

6b12584

implement nextval&currval for multi-session, minor bugs

bd4210e

partially implemented drop seq

80ad516

merge

e6811f9

danae-s and others added 7 commits May 4, 2018 23:47

Merge branch 'pr2' of https://github.com/HenryZhou0333/peloton into pr2

9106ba8

# Conflicts: # src/function/old_engine_string_functions.cpp

fix bug with nextval & currval. now support multi-session

28045be

fix bug with nextval & currval. now support multi-session

3d93dc6

fixing some comments

fc4a385

add an exception case for currval

527bfc5

drop seq with errors

836ffc0

drop seq with a bug about txn visibility

5c760c6

saatviks added do not merge class-project labels May 6, 2018

lym953 reviewed May 11, 2018

View reviewed changes

yjc408 reviewed May 11, 2018

View reviewed changes

yangjuns reviewed May 11, 2018

View reviewed changes

apavlo added a commit to apavlo/peloton that referenced this pull request Jun 10, 2018

Checkpoint on fixing the sequence PR cmu-db#1345. I am slowly removin…

66cef0a

…g the temp table components...

apavlo mentioned this pull request Jun 10, 2018

Add New SessionContext Object #1397

Open

apavlo added a commit to apavlo/peloton that referenced this pull request Jun 11, 2018

Initial checkin with the sequence code (without temporary tables) from …

c0a9bd4

…cmu-db#1345

apavlo added a commit to apavlo/peloton that referenced this pull request Jun 11, 2018

Checking in the testing files from cmu-db#1345

bee9751

apavlo added a commit to apavlo/peloton that referenced this pull request Jun 11, 2018

These should be the last files that we need from from cmu-db#1345

1e21a52

apavlo closed this Jun 11, 2018

apavlo mentioned this pull request Jun 14, 2018

Sequences #1407

Open


		type::EphemeralPool *GetPool();

		std::string GetDatabaseName() const;


		LOG_INFO("sequence %d will be deleted!", sequence_oid);

		oid_t database_oid = database_object->GetDatabaseOid();

[15721] Sequence second PR #1345

[15721] Sequence second PR #1345

Uh oh!

Conversation

bdengNE commented May 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

apavlo commented Jun 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development