StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>You need to fetch the latest of both remote repositories and compare the main branches to each other. It looks like the main branch is the 'trunk' branch, so you can see what commits are unique to your project (and not in the trunk branch of the 'mirror' project) like this:</p> <pre><code>$ git log --oneline origin/trunk ^mirror/trunk 1c4fa82 1. Modified the flag name for gb_to_idx rewrite to hive.ql.rewrite.gb_to_idx So 638be54 Merge branch 'trunk' of git@github.com:prafullat/hive into trunk 72c8220 HIVE-1383. Allow HBase WAL to be disabled (John Sichi via Ning Zhang) a372259 Checking in commented meta-data methods in GbToCompactSumIdxRewrite. It has to be unc 33c1fb1 Fixing some files due to wrong application of patch. Build now compiles ! 5942728 Reverting files which were patched twice in last checkin. 5efda04 Adding inital rewrite changes. This patch adds basic query rewrite support to Hive. I 3fce190 Merge branch 'trunk' of git://github.com/apache/hive into trunk b3f9ff2 Checking in commented meta-data methods in GbToCompactSumIdxRewrite. It has to be unc d89deb9 Fixing some files due to wrong application of patch. Build now compiles ! 11db7da Reverting files which were patched twice in last checkin. 88fee30 Adding inital rewrite changes. ba7703f Some part of last check-in got missed. 2c5c5ae Checking initial changes for Hive indexing from He Yongqiang (Hive-417) Here is descr </code></pre> <p>Or you can remove the <code>--oneline</code> to see the full commit messages. It looks like they're all yours. You can also add a <code>--no-merges</code> if you don't want to see those merge commits.</p> <p>Next, you can get the actual diff by running this:</p> <pre><code>$ git diff --stat mirror/trunk...origin/trunk README.txt | 4 +- build.xml | 1 + .../java/org/apache/hadoop/hive/conf/HiveConf.java | 1 + ivy/ivysettings.xml | 4 +- metastore/if/hive_metastore.thrift | 12 +- .../apache/hadoop/hive/metastore/api/Index.java | 15 +- .../hive/metastore/api/ThriftHiveMetastore.java | 671 +++++++++++++++++++- metastore/src/gen-php/hive_metastore_types.php | 30 +- .../hadoop/hive/metastore/HiveMetaStore.java | 155 ++++- .../hadoop/hive/metastore/HiveMetaStoreClient.java | 9 +- .../hadoop/hive/metastore/IMetaStoreClient.java | 14 + .../hadoop/hive/metastore/MetaStoreUtils.java | 31 + (bunch more lines) ql/src/test/queries/clientpositive/index_compact.q | 13 + .../test/queries/clientpositive/index_projection.q | 13 + ql/src/test/queries/clientpositive/index_summary.q | 13 + .../queries/clientpositive/ql_rewrite_gbtoidx.q | 9 + .../results/clientpositive/index_compact.q.out | 70 ++ .../clientpositive/ql_rewrite_gbtoidx.q.out | 211 ++++++ .../primitive/PrimitiveObjectInspectorUtils.java | 29 +- 57 files changed, 4000 insertions(+), 131 deletions(-) </code></pre> <p>If you remove the <code>--stat</code>, you'll get the actual diff. The <code>...</code> in between the <code>mirror/trunk</code> and <code>origin/trunk</code> is a shorthand saying you want the diff between the common ancestor, so it doesn't give you a diff removing everything added to the original project since you started, it just gives you the changes you've made on your branch.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload